snipe
|
b7eb72fe49
|
Rough refactor of the acceptance controller
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
|
snipe
|
8e85d316c9
|
Removed stored_eula_file from API transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
|
snipe
|
4eab5fd075
|
Removed older comments
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
|
snipe
|
266a9e5328
|
Removed stored_eula_file from controller
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
|
snipe
|
f609146c29
|
Corrected field name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 15:37:10 -07:00 |
|
|
snipe
|
891009dc67
|
Nicer formatting for buttons in bulk user edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 15:35:57 -07:00 |
|
|
snipe
|
014a32b050
|
Run migrations after restore
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 14:12:17 -07:00 |
|
Ivan Nieto Vivanco
|
1453b36484
|
Add filter to only get Assets for the unaccepted assets report
|
2022-05-18 14:46:48 -05:00 |
|
|
Ivan Nieto Vivanco
|
a771984619
|
Add an early return if for some reason the import record is not found
|
2022-05-18 06:15:46 -05:00 |
|
Brady Wetherington
|
b4a0d33ba8
|
Reduce logging further; we know the main error condition now
|
2022-05-17 19:57:42 -07:00 |
|
|
snipe
|
a8eb138ae0
|
Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect
Fixes #11096 Backup created_at time is incorrect
|
2022-05-17 14:39:19 -07:00 |
|
|
Ivan Nieto Vivanco
|
72493d54aa
|
Show the date and time as the user select in their settings
|
2022-05-17 16:36:05 -05:00 |
|
|
Ivan Nieto Vivanco
|
91c7a89f93
|
Change to use the date() function instead of Helper::getFormattedDateObject()
|
2022-05-17 16:24:52 -05:00 |
|
|
snipe
|
11f540daaf
|
Added debug line
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-17 09:41:35 -07:00 |
|
|
snipe
|
0dfc98a493
|
Force db:wipe
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-17 04:27:48 -07:00 |
|
|
snipe
|
d4f7b5f80c
|
Fixed #11100 for individual users
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-16 12:07:18 -07:00 |
|
|
snipe
|
64b582c657
|
Merge pull request #11108 from uberbrady/fix_ldap_first_login_password
Pass the password along directly instead of retrieving it from the In…
|
2022-05-16 11:01:35 -07:00 |
|
|
Brady Wetherington
|
6c86a28d18
|
Pass the password along directly instead of retrieving it from the Input or Request
|
2022-05-16 10:58:27 -07:00 |
|
|
Brady Wetherington
|
b05d85ab0a
|
Fix bulk-user reset-password links
|
2022-05-16 10:38:12 -07:00 |
|
Johnson Yi
|
4401dab8d6
|
fix saml slo for logout
|
2022-05-14 11:59:34 +00:00 |
|
|
snipe
|
333aa05809
|
Added missing use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 16:46:13 -07:00 |
|
|
snipe
|
c5ec3efc70
|
Merge pull request #11065 from snipe/fixes/double_encoding_for_custom_fields
Fixed #11014 - double encoding for custom fields
|
2022-05-13 16:12:24 -07:00 |
|
|
Brady Wetherington
|
0ddb0f2c81
|
Switch the barcode backend to SVG, and fix the two-factor middleware
|
2022-05-13 14:22:27 -07:00 |
|
|
snipe
|
6fc222a648
|
Fixed #11014 - Removed double escaping on custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:45:00 -07:00 |
|
|
snipe
|
ef1eb15a91
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/permissions.php
|
2022-05-12 09:31:42 -07:00 |
|
|
snipe
|
c52faaf23d
|
Added checkout to permissions check
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-11 19:02:23 -07:00 |
|
|
snipe
|
780222d372
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
|
2022-05-10 17:26:26 -07:00 |
|
|
snipe
|
4fccf4ddc4
|
Few more log lines
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:27:42 -07:00 |
|
|
snipe
|
646166b2b6
|
Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:16:07 -07:00 |
|
|
snipe
|
f4e737eaf3
|
More SAML debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:14:22 -07:00 |
|
|
snipe
|
f572eaa421
|
Added debugging for SAML login
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:07:07 -07:00 |
|
|
snipe
|
dfd4d54433
|
Fixed route name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 15:46:25 -07:00 |
|
|
snipe
|
220f94faee
|
Check that the session key exists
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 14:10:47 -07:00 |
|
|
snipe
|
22ec3c1398
|
Use error style instead of warn/info when nothing was selected
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:41:52 -07:00 |
|
|
snipe
|
caf17d4f25
|
Fixed wrong variable name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:41:32 -07:00 |
|
|
snipe
|
e1b24bb763
|
Added a comment
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:30:21 -07:00 |
|
|
snipe
|
76213ec3d9
|
Create a session on bulk actions, store it for redirect, then delete it
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:14:08 -07:00 |
|
|
snipe
|
243739e9c3
|
Added missing gate for bulk checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:13:36 -07:00 |
|
|
snipe
|
784bf4d784
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .github/ISSUE_TEMPLATE/feature_request.yml
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ReportsController.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/users/print.blade.php
# webpack.mix.js
|
2022-05-06 01:52:43 -07:00 |
|
|
snipe
|
b20921cb62
|
Removed duplicate session regenerate
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-05 21:35:05 -07:00 |
|
|
snipe
|
0939591efb
|
Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop
|
2022-05-05 13:28:00 -07:00 |
|
|
snipe
|
a859eac4a0
|
Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null
|
2022-05-05 13:27:45 -07:00 |
|
|
snipe
|
953b3a8d6e
|
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8
Merge master into develop for RC 6.0.0-8
|
2022-05-05 10:53:17 -07:00 |
|
|
Ivan Nieto Vivanco
|
37805509da
|
Adds an integer casting to the order input field so it cannot be null
|
2022-05-01 15:27:05 -05:00 |
|
|
Ivan Nieto Vivanco
|
01232d9a54
|
Adds an integer casting to the order input field so it cannot be null
|
2022-05-01 15:16:56 -05:00 |
|
|
Ivan Nieto Vivanco
|
ac8da55270
|
Evaluate if an item still exists before trying to get its name in the report
|
2022-05-01 13:25:55 -05:00 |
|
|
Ivan Nieto Vivanco
|
1cbbf8f976
|
Evaluate if an item still exists before trying to get its name in the report
|
2022-05-01 13:11:05 -05:00 |
|
|
Johnson Yi
|
92fe1287ea
|
Do not saml login automatically after normal logout
|
2022-04-29 15:35:08 +00:00 |
|
|
snipe
|
9aac1cbba4
|
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
|
2022-04-28 17:49:06 +01:00 |
|
|
snipe
|
2e9cf8fa87
|
Added access gate to the requested assets index
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-28 15:45:37 +01:00 |
|