snipe
|
deb2d958d8
|
Sets maxlength of user fields to 191
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 04:54:12 -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
|
446e44deb6
|
Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative
Fixed validation for purchase cost allowed to be negative
|
2022-05-10 17:36:01 -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 |
|
Godfrey M
|
2c1f368828
|
adds validation for all purchase costs variables
|
2022-05-10 16:26:06 -07:00 |
|
|
Godfrey M
|
33b1ab3658
|
prevents values for assets being negative through validation
|
2022-05-10 16:19:06 -07:00 |
|
|
snipe
|
f4650c65db
|
Clearer phrasing for log
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 13:00:48 -07:00 |
|
|
snipe
|
d3830a44d8
|
Added more verbose messaging
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:40:50 -07:00 |
|
|
snipe
|
5869b6ed0c
|
And still more debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:38:46 -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
|
dc8669121d
|
Added license seat ID to the UI
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-09 10:59:06 -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
|
adc017db23
|
Added checkbox to audit listing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:16:13 -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 |
|
|
snipe
|
5c78a15835
|
Removed dupe lines from merge conflict
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-03 12:56:29 -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 |
|
|
snipe
|
f623d05d0c
|
Escape checkout target name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-24 15:27:11 +01:00 |
|
|
Godfrey M
|
91694064fb
|
fixes double updates from action log and history
|
2022-04-18 11:30:24 -07:00 |
|
|
snipe
|
b2087a9947
|
Adds validator to make sure the status ID is deployable
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-15 13:06:55 +01:00 |
|
|
snipe
|
6b1329133b
|
Adds status ID to asset checkout API endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-15 13:06:35 +01:00 |
|
|
snipe
|
698c7f4904
|
Fixes potential XSS vuln in user requestable results
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-15 12:22:20 +01:00 |
|
|
snipe
|
1441cf9f4f
|
Ports #10494 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-12 21:04:57 +01:00 |
|
|
snipe
|
7b891f0952
|
Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations
Fixes Bulk user edit not updating checked out asset locations
|
2022-04-07 19:41:01 +01:00 |
|
|
snipe
|
8218b5ef47
|
Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop
Fixes Bulk user edit not updating checked out asset locations
|
2022-04-07 19:40:42 +01:00 |
|
|
snipe
|
b73542664b
|
Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am
Fixed #10866 - Checkin time always shows 12am
|
2022-04-07 19:40:11 +01:00 |
|
|
Godfrey M
|
3eb7a87a66
|
fixes action_date for check-in not including H:i:s
|
2022-04-07 11:24:12 -07:00 |
|
|
Godfrey M
|
1325628039
|
fixes typo
|
2022-04-07 11:18:16 -07:00 |
|
|
Godfrey M
|
8498082f21
|
fixes typo
|
2022-04-07 11:16:40 -07:00 |
|
|
Godfrey M
|
6dc45c189b
|
removed deadspace
|
2022-04-07 11:10:36 -07:00 |
|
|
Godfrey M
|
5d0a1ebb7a
|
fixes action_date for check-in not including H:i:s
|
2022-04-07 11:08:43 -07:00 |
|