DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 12:04:21 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10373 commits 97 branches 267 tags 296 MiB
Commit graph

10373 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 bc30eef23e clean up 2022-03-22 10:04:54 -07:00
Godfrey M 62352ef1a1 completes accessory eula agreement blade 2022-03-22 10:04:22 -07:00
snipe 729b23c0cf
Merge pull request #10857 from uberbrady/fix_bs_tables_export_options 
Fix bs tables export options
 2022-03-22 17:03:18 +00:00
Brady Wetherington af9f3d5e1e Clean up the bootstrap table export options 2022-03-22 16:05:08 +00:00
snipe e9a59f55ab
Merge pull request #10855 from inietov/fixes/exception_boolean_field_check_no_customfields 
Validate custom fieldset only if the asset have one
 2022-03-22 15:58:01 +00:00
Ivan Nieto Vivanco 98b78837e1 Validate custom fieldset only if the asset have one 2022-03-22 09:38:57 -06:00
Brady Wetherington 00ca30a205 WIP: fix bootstrap table export options 2022-03-22 15:12:11 +00:00
snipe 8c92198636 Possible fix for boolean field check 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-22 13:47:43 +00:00
snipe 169973e697
Merge pull request #10853 from inietov/fixes/customfields_boolean_format_not_saving_master 
Fixes Customfields with boolean format not saving master[sc-9973]
 2022-03-22 00:57:41 +00:00
Ivan Nieto Vivanco 7571c0b850 Add support for boolean type customfields 2022-03-21 18:48:42 -06:00
snipe 26cababc43
Merge pull request #10851 from inietov/fixes/licenses_assigned_to_assets_dont_follow_users 
Fixes #10753 Licenses assigned to assets don't follow users
 2022-03-21 21:22:41 +00: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 820f0a7f04
Merge pull request #10849 from snipe/fixes/10769_return_to_due_for_audit 
Fixes #10769 - return to Due for Audit screen after auditing
 2022-03-21 14:28:13 +00: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 c01cc48482
Merge pull request #10848 from snipe/fixes/10819_use_full_url_for_barcodes_in_label_view 
Fixed #10819 - use full url for label barcodes
 2022-03-21 14:00:56 +00:00
snipe 760b78b584 Fixed #10819 - use full url for label barcodes 
I don’t know when/why this would really be necessary, since it would be weird to call /hardware/123/label, but this fixes the broken barcodes

Signed-off-by: snipe <snipe@snipe.net>
 2022-03-21 13:57:18 +00:00
Maciej Domanski d53750d389 LdapSync 2022-03-21 10:37:14 +01:00
Maciej Domanski 565f4eb6a1 LdapSync 2022-03-21 10:36:15 +01:00
Maciej Domanski 4a9ff86941 revert LdapSync 2022-03-21 10:31:21 +01:00
Maciej Domanski 70b22784fe
Delete LdapSync.php 2022-03-21 10:04:42 +01:00
Maciej Domanski 374bed3f0c info update codeql 2022-03-21 09:51:29 +01:00
snipe ada0932e80
Merge pull request #10841 from snipe/fixes/default_id_suppliers 
Fixed #10840 - defaulting to 0 on supplier ID if no value provided
 2022-03-19 23:20:36 +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
snipe 42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving 
Fixes Customfields with boolean format not saving [ch-9973]
 2022-03-19 22:10:54 +00:00
Maciej Domanski 41e89123e1 revert from develop 2022-03-17 12:22:37 +01:00
Maciej Domanski e09516d69b codeql sa 2022-03-17 12:10:44 +01:00
Ivan Nieto Vivanco 6ed9ed0e79 Add field type boolean to custom fields list all 2022-03-16 17:21:05 -06: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
Godfrey M 5fcc3c39f3 routes eula agreements for download correctly to the asset history 2022-03-16 11:56:56 -07:00
snipe d55c176199
Merge pull request #10831 from snipe/merges/master_down_to_develop_march_16 
v6.0.0-RC-5 - Merges master down to develop
 2022-03-16 18:35:42 +00:00
snipe c0451fe17a Bumped version to v6.0.0-RC-5 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:10:17 +00:00
snipe 0f95802699 Fixed mis-automerge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:05:47 +00:00
snipe 9db8bd782d Merging master down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:02:07 +00:00
snipe 93ff9524d6
Merge pull request #10829 from snipe/features/add_statuslabel_filter_by_type_in_api 
Added filter by status_type in StatusLabels API index endpoint
 2022-03-16 10:04:58 -07:00
Godfrey M 6386fa1c5e clean up 2022-03-16 09:54:10 -07:00
snipe 89ddbddada Fixed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 16:53:18 +00:00
snipe 7498fe36e9 Removed extra space because pedantry 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 16:45:03 +00:00
snipe babf7c064b Added ability to filter status label index endpoint by status type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 16:38:45 +00:00
snipe 40a9470770
Merge pull request #10828 from snipe/fixes/10826_parse_error_on_print_all 
Fixed #10826 - parse error on translation string for print all assets
 2022-03-16 08:54:10 -07:00
snipe 781b426018 Fixed #10826 - parse error on translation string for print all assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 08:50:47 -07:00
snipe f499dcf7c3
Merge pull request #10827 from snipe/fixes/modal_dropdowns_broken 
Fixed #10825 - selectlists in modals b0rked
 2022-03-16 08:25:29 -07:00
snipe 54d6a4d978 Fixed #10825 - selectlists in modals b0rked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 08:23:50 -07:00
Maciej Domanski 44d5b589bb
Update phpstan.neon 2022-03-16 15:22:45 +01:00
Maciej Domanski 0a98adb246
Update SA-phpstan.yml 2022-03-16 15:22:27 +01:00