DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7471 commits 101 branches 268 tags 288 MiB
Commit graph

7471 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Ivan Nieto Vivanco 6ed9ed0e79 Add field type boolean to custom fields list all 2022-03-16 17:21:05 -06: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
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
snipe 84aa26dd50
Merge pull request #10728 from Godmartinz/gh10191-css-dropdownmenu 
Fixed #10191 - font color contrast on mobile menu
 2022-03-10 13:02:45 -08:00
snipe 8984b3a59d
Merge pull request #10812 from inietov/fixes/CarbonExceptions_InvalidFormatException_DateTime_develop 
Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string develop
 2022-03-10 10:40:33 -08:00
Ivan Nieto Vivanco cdc0805fc4 Sanitize dates input in the importer before saving 2022-03-10 12:07:07 -06:00
Ivan Nieto Vivanco 86bd90c564 Show icons in the asset view for boolean customfields 2022-03-09 21:46:19 -06:00
Ivan Nieto Vivanco e104195796 Convert value of the customfield element from string to boolean 2022-03-09 18:49:39 -06:00
snipe d06ef4bdef Bumped lockfile 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-08 22:17:46 -08:00
snipe c817daa4da
Merge pull request #10767 from uberbrady/fix_double_request_datatable 
One attempt to fix the 'datatable double-request' problem.
 2022-03-08 20:34:15 -08:00
snipe 1b3631d57d
Merge pull request #10806 from snipe/fixes/removed_experimental_content_policies 
Removed experimental feature policies
 2022-03-08 20:32:39 -08:00
snipe e3d2f7cc96 Missed a few 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-08 20:05:17 -08:00
snipe d1358b6249 Removed experimental feature policies 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-08 16:58:24 -08:00
snipe 95d6e1a402
Merge pull request #10805 from inietov/fixes/date_localization_not_working_custom_fields_develop 
Fixes #8143 Date localization not work in custom fields for develop branch
 2022-03-08 16:36:31 -08:00
Ivan Nieto Vivanco 657cfddd3c Add a condition to show customfields as the user wants in localization settings 2022-03-08 18:28:13 -06:00
snipe 9311584f43
Merge pull request #10033 from uberbrady/ldap_troubleshooter_cherrypicked 
Fixed [ch14855] - create LDAP troubleshooter
 2022-03-07 20:24:11 -08:00
Brady Wetherington ab7bf3c5d4 Get rid of stale commented-out line 2022-03-07 20:22:23 -08:00
Brady Wetherington 0556c7653a Implement a generic timeout function, and run methods that need to run with a timeout using it. 2022-03-07 19:51:21 -08:00
Brady Wetherington b96303cb38 Clean up errors, add new required package to Dockerfile 2022-03-07 19:51:21 -08:00
Brady Wetherington 312a90ce77 Add start of Tracing to LDAP troubleshooter 2022-03-07 19:51:21 -08:00
Brady Wetherington 71b5c0e80f Add new LDAP troubleshoot ldapsearch subcommand, broaden out troubleshooting 2022-03-07 19:51:21 -08:00
Brady Wetherington 519bd00bef WIP - just need to get authed connections to work 2022-03-07 19:51:21 -08:00
Brady Wetherington ffd8f583b4 Got most of the stages working for the LDAP troubleshooter 2022-03-07 19:51:21 -08:00
Brady Wetherington 8cd5ec6799 Most of the host-port-tls discovery stuff is in-place now 2022-03-07 19:51:20 -08:00