snipe
|
f077d096e2
|
Merge pull request #10735 from inietov/fixes/imported_assets_duplicate_model_notes_from_assets
Separate notes on assets and asset models [sc-18810]
|
2022-02-24 14:15:13 -08:00 |
|
Ivan Nieto Vivanco
|
577dc6b02c
|
Separate notes on assets and asset models
|
2022-02-24 15:50:59 -06:00 |
|
|
snipe
|
292bf21e7d
|
Merge pull request #10720 from uberbrady/fix_cors_develop
Fix cors develop
|
2022-02-22 19:23:43 -08:00 |
|
Brady Wetherington
|
294606fb0b
|
Move new CORS library to global middleware, the only place it works
|
2022-02-22 19:07:23 -08:00 |
|
|
Brady Wetherington
|
cd2c92fd6c
|
Cors should respect the .env var for CORS domains
|
2022-02-22 19:00:59 -08:00 |
|
|
snipe
|
6ef053bc52
|
Merge pull request #10713 from snipe/fixes/error_handler
Added use statement
|
2022-02-22 10:46:58 -08:00 |
|
|
snipe
|
0a4a548f9c
|
Added use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-22 10:46:02 -08:00 |
|
|
snipe
|
784bf6f223
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-20 13:30:24 -08:00 |
|
|
snipe
|
dd5f812d88
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
|
2022-02-20 13:29:12 -08:00 |
|
|
snipe
|
cbfb8283f3
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2022-02-20 11:29:55 -08:00 |
|
|
snipe
|
dc2b58f865
|
Merge pull request #10691 from snipe/fixes/update_audit_date_when_settings_update
Fixed #10690 - Initial audit date fix
|
2022-02-20 11:16:54 -08:00 |
|
|
snipe
|
34ebc629c2
|
Remove unusued translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-20 11:15:56 -08:00 |
|
|
snipe
|
21a6bdabc6
|
Add @insert-waffle as a contributor
|
2022-02-20 11:12:52 -08:00 |
|
|
snipe
|
eaf4fefc90
|
Merge pull request #10700 from insert-waffle/develop
Fixes #10699: Added 2 breaks in message.blade.php
|
2022-02-20 11:12:20 -08:00 |
|
|
snipe
|
19b25a39ea
|
Merge pull request #10697 from inietov/features/save_loggedin_user_after_restore
Feature Save logged in user data and re-add them after restore if they don't exist [ch-17664]
|
2022-02-20 11:11:54 -08:00 |
|
Jens Maes
|
e5f6b48115
|
🧑🔧 Added 2 breaks in message.blade.php
The uploaded logo does not align properly, therefor I added 2 breaks which make sure the site title is BELOW the logo and not next to it.
|
2022-02-18 10:27:12 +01:00 |
|
|
Ivan Nieto Vivanco
|
f1ba5c7742
|
Changed the warning message in the Backups page
|
2022-02-17 22:47:35 -06:00 |
|
|
Ivan Nieto Vivanco
|
23a6907975
|
Some minor stylistic changes
|
2022-02-17 18:05:06 -06:00 |
|
|
Ivan Nieto Vivanco
|
5b2a5ff124
|
Put the 'remember_token' column as null in the users table
|
2022-02-17 18:03:00 -06:00 |
|
|
Ivan Nieto Vivanco
|
548b172744
|
Logout every connected user
|
2022-02-17 18:00:24 -06:00 |
|
|
Ivan Nieto Vivanco
|
263893b3c6
|
Search logged in user that made the restore, if they doesn't exist in the restored system, add it again
|
2022-02-17 17:42:06 -06:00 |
|
|
Ivan Nieto Vivanco
|
811ca51c4f
|
Wipe database before restoration
|
2022-02-17 16:59:44 -06:00 |
|
|
snipe
|
d1b45a83b8
|
Blergh, one more linebreak
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:51:06 -08:00 |
|
|
snipe
|
01a8701a8c
|
Removed extra linebreaks
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:50:38 -08:00 |
|
|
snipe
|
67fe53e32a
|
Removed debugging, added comments
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:50:07 -08:00 |
|
|
snipe
|
7f6b8cc43d
|
Removed carbon, since we went with PHP's datetime instead
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:48:12 -08:00 |
|
|
snipe
|
5fe999eb02
|
Shored up the date math, updated the explanation
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-17 14:34:33 -08:00 |
|
|
snipe
|
ea429d650e
|
Initial audit date fix
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 20:19:38 -08:00 |
|
|
snipe
|
a71911eba2
|
Merge pull request #10688 from snipe/features/add_unique_option_to_custom_fields
Fixes #9592 - Added unique option to custom fields
|
2022-02-16 16:22:19 -07:00 |
|
|
snipe
|
13832856f1
|
Added strings for unique
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:47:59 -08:00 |
|
|
snipe
|
824eedf7c2
|
Added UI elements for is_unique
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:47:48 -08:00 |
|
|
snipe
|
a4a0aa5124
|
Removed debugging line
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:47:22 -08:00 |
|
|
snipe
|
6a91d4d19e
|
Check for uniqueness constraint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:46:22 -08:00 |
|
|
snipe
|
41778980bc
|
Add migration for is_unique
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:45:59 -08:00 |
|
|
snipe
|
ea8f9a6dd9
|
Make is_unique fillable
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 13:45:44 -08:00 |
|
|
snipe
|
b78f32e876
|
Merge pull request #10655 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object_develop
Fixes ErrorException: Trying to get property 'checkin_email' of non-object for develop[sc-17568]
|
2022-02-16 11:19:14 -07:00 |
|
|
snipe
|
7fe7d56999
|
Merge pull request #10656 from snipe/snyk-upgrade-0005397ba83c98631126ff98d5471e6d
[Snyk] Upgrade jquery-ui from 1.13.0 to 1.13.1
|
2022-02-16 11:19:00 -07:00 |
|
|
snipe
|
592f66bd0c
|
Merge pull request #10670 from Godmartinz/gh10639/linear-depreciation-calculation
Fixed #10639 - incorrect linear depreciation calculation
|
2022-02-16 11:18:27 -07:00 |
|
|
snipe
|
4f89dfee49
|
Merge pull request #10679 from snipe/fixes/timing_attack_mitigation_for_forgot_password
Added usleep random to forgotten password method to mitigate timing attacks
|
2022-02-16 11:17:00 -07:00 |
|
|
snipe
|
017534bc07
|
Added deleted_at to license transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:33:28 -08:00 |
|
|
snipe
|
5540069cce
|
Be more specific with deleted license point
Require this value to be "true" speciically to get the deleted list
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:14:04 -08:00 |
|
|
snipe
|
e9a4ff8e74
|
Merge pull request #10683 from snipe/features/add_deleted_only_endpoint_for_licenses
Adds delete endpoint for licenses
|
2022-02-16 10:10:22 -07:00 |
|
|
snipe
|
1ad56760ce
|
Adds delete endpoint for licenses
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:08:50 -08:00 |
|
|
snipe
|
5582949008
|
Merge pull request #10681 from snipe/fixes/2fa_cookie_fix
Fixes 2FA cookie -> user issue
|
2022-02-15 19:34:13 -07:00 |
|
|
snipe
|
f878e0ad66
|
Fixes 2FA cookie -> user issue
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-15 18:29:23 -08:00 |
|
|
snipe
|
178e440951
|
Added usleep :(
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-15 18:09:58 -08:00 |
|
|
snipe
|
321be4733d
|
Merge pull request #10672 from snipe/fixes/missing_gates_for_maintenances
Added Asset edit/delete gates to maintenances
|
2022-02-14 15:58:19 -08:00 |
|
|
snipe
|
cab4fa1687
|
Fixes some conceptual gates
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-14 15:42:23 -08:00 |
|
|
snipe
|
4804e5b3ab
|
Added Asset edit/delete gates to maintenances
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-14 15:34:06 -08:00 |
|
Godfrey M
|
7b9a2ae909
|
added rounding
|
2022-02-14 09:34:42 -08:00 |
|