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
snipe
f623d05d0c
Escape checkout target name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-24 15:27:11 +01: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
Ivan Nieto Vivanco
e1927aa154
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:23:49 -05:00
Ivan Nieto Vivanco
6529a75683
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:12:02 -05:00
Ivan Nieto Vivanco
1a448cc4b6
Take the values from the importer form to configure the used importer
2022-03-29 17:31:43 -06:00
snipe
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:28:43 +01:00
snipe
bdabbbd4e9
Logout user when their activated status is switched to off
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 13:44:53 +01:00
snipe
7941a88623
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets
...
Fix #10810 unaccepted assets
2022-03-29 12:10:37 +01:00
snipe
b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync
...
This looks good, thanks!
2022-03-29 12:06:01 +01:00
snipe
639409fb3f
Backporting #10829 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-25 13:00:16 +00:00
Godfrey M
a1429ce86b
removed manager_name from user files
2022-03-24 11:47:13 -07:00
Godfrey M
c1f8252388
adds manager field to LDAP sync
2022-03-24 11:24:39 -07:00
Godfrey M
55680762de
Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync
2022-03-22 16:33:58 -07:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
Godfrey M
3e01981576
clean up
2022-03-22 10:07:08 -07:00
Godfrey M
62352ef1a1
completes accessory eula agreement blade
2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco
319d816002
Update in the license seat the user that the asset with that license have assigned
2022-03-21 15:06:43 -06:00
Godfrey M
4956eb0410
WIP: needs to be tested. adds ldap_manager field to ldap sync
2022-03-21 11:15:39 -07:00
Godfrey M
220df9710e
adds most of the fields for an accessory eula agreement pdf
2022-03-21 09:18:29 -07:00
snipe
df60729140
Fixed #10769 - redirect user back to due for audit page
...
This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page.
Signed-off-by: snipe <snipe@snipe.net>
2022-03-21 14:27:18 +00:00
snipe
e04ae63d02
Apply the fix to API controller too :(
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:12:48 +00:00
snipe
7db252ade3
Fixed #10840 - defaulting to 0 on supplier ID if no value provided
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:11:42 +00:00
Godfrey M
b2e78e3382
formats most of the pdf blade
2022-03-16 15:53:32 -07:00
Dampfklon
9818d16834
fix showDeletedFunction by reverting #9508
2022-03-16 20:20:46 +01:00
