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

10355 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c12ef19fcc Fixed #10892 - MySQL 8 compatibilty requires primary key 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 18:58:14 +01:00
Ivan Nieto Vivanco 2d213a9c77 Make the report take the dates of pivot table instead of asset log 2022-04-05 12:57:49 -05:00
snipe 91e6acbfd9 Add @veenone as a contributor 2022-04-05 18:52:17 +01:00
snipe 08588a2e6a
Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view 
Fixes #10898 (invalid consumable date time info in user view)
 2022-04-05 18:30:23 +01:00
snipe 0882cfede2
Merge pull request #10895 from ubc-cpsc/master 
Security fixes to master branch
 2022-04-05 18:29:25 +01:00
Achmad Fienan Rahardianto 231a34ace3 FIX: #10898 (invalid consumable date time info in user view) 2022-04-05 15:31:27 +07:00
Joël Pittet 472c94ef89 Security updates to enshrined/svg-sanitize and guzzlehttp/psr7 2022-04-04 12:31:27 -07:00
Joël Pittet 96cd90f842 Security fixes to master branch 2022-04-04 11:04:06 -07: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 f7cd21a007 Sigh. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 22:59:52 +01:00
snipe 8ccf148799 Fixed #10881 - bad merge with bootstrap-tables changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 22:57:00 +01:00
snipe b2056816c9 Use the same string for both radio buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:45:55 +01:00
snipe 67b0e731e5
Merge pull request #10879 from snipe/rcs/merge_master_into_develop 
Merge master back down into develop
 2022-03-29 16:40:31 +01: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 d56552a8af
Merge pull request #10876 from snipe/fixes/huntr_ebc26354_logout_user_when_deactivated 
Logout user when their activated status is switched to off
 2022-03-29 15:57:24 +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 80dff41c00
Merge pull request #10843 from ahpaleus/features/add_codeql_to_sdlc 
[Feature] Adds CodeQL to the SDLC process
 2022-03-29 12:07:44 +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 ab18ceb2f9 Add @QveenSi as a contributor 2022-03-29 11:54:51 +01:00
snipe e046db6d1e
Merge pull request #10874 from QveenSi/patch-1 
Fix problem with static paths
 2022-03-29 11:52:32 +01:00
Yevhenii Huzii 863ea62551
Fix problem with static paths 2022-03-27 23:12:38 +03:00
snipe 70059f6f80
Merge pull request #10873 from uberbrady/fix_dashboard 
Don't crash JS when there are no data-export-options (as is true in Dashboard) Fixes #10872
 2022-03-27 07:21:34 +01:00
Brady Wetherington e50ad8a442 Don't crash JS when there are no data-export-options (as is true in Dashboard) 2022-03-27 07:18:12 +01:00
snipe 639409fb3f Backporting #10829 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-25 13:00:16 +00:00
snipe e207a5043e
Merge pull request #10737 from Godmartinz/feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 
Fixed #7891, #3019 and #8260 [sc-15014] - added asset acceptance and signed eula as pdf
 2022-03-24 20:52:41 +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
snipe edcf109b0f
Merge pull request #10861 from andreaci/develop 
next_audit_date error on saving asset
 2022-03-23 18:44:21 +00:00
andreaci ff5a95a6a4
next_audit_date error on saving asset 
Solved error 500 when saving new Asset and no next_audit_date  is defined
 2022-03-23 17:23:53 +01:00
Godfrey M 55680762de Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync 2022-03-22 16:33:58 -07:00
snipe 20e65804ef Removed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-22 18:12:08 +00: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 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