DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10923 commits 101 branches 268 tags 288 MiB
Commit graph

10923 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5a9c2925c3
Merge pull request #13264 from marcusmoore/bug/sc-23451 
Fix label wrapping on category edit page
 2023-07-06 19:01:36 +01:00
Marcus Moore ef160b0e15
Add span tag so label is displayed properly 2023-07-06 10:49:57 -07:00
snipe 2faa73f983
Merge pull request #13169 from akemidx/license_sn_check1 
Making Serial Number the logic checked against for new imports
 2023-07-06 16:40:27 +01:00
snipe d37aaee4c8
Merge pull request #13257 from snipe/fixes/check_for_ceiling_in_upgrader 
Check for max PHP version in upgrader
 2023-07-06 16:07:10 +01:00
snipe a9d175a396 Check for max PHP version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-05 18:47:48 +01:00
snipe 35039cd590
Merge pull request #13255 from snipe/fixes/larger_field_for_idp_meta 
Change settings table `saml_idp_metadata` to MEDIUMTEXT
 2023-07-05 17:30:02 +01:00
snipe c85a33be6a Change settings table saml_idp_metadata to MEDIUMTEXT 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-05 17:28:08 +01:00
snipe d890d923ff Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-05 14:40:54 +01:00
snipe 4b4983e550
Merge pull request #13253 from uberbrady/improve_scim_404s 
Properly return SCIM Exceptions
 2023-07-05 14:37:32 +01:00
Brady Wetherington a6a89ddd6c Also log(debug) the error - could be useful for troubleshooting 2023-07-05 14:31:08 +01:00
Brady Wetherington 1f4d2f1e4a Properly return SCIM Exceptions 2023-07-05 14:27:10 +01:00
snipe bbbeaaee2b
Merge pull request #13232 from Godmartinz/labels_overlapping_issue 
fixed barcode and info from overlapping
 2023-06-29 21:23:31 +01:00
Godfrey M df90e924b4 prevent labels from overlapping 2023-06-29 13:18:17 -07:00
snipe 630b6496ec
Merge pull request #13231 from snipe/fixes/small_fix_for_error_during_seeding 
Redirect if the license can’t be found
 2023-06-29 21:18:02 +01:00
snipe 7937542dcb Redirect if the license can’t be found 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-29 21:15:50 +01:00
snipe e236bf412c
Merge pull request #13230 from snipe/fixes/windows_backup_filename_colon_wtf_issue 
Fixed windows backup filename - swapped colon in timestamp to hyphen to handle windows filesystems
 2023-06-29 20:37:09 +01:00
snipe fb9b3a5453 Switched from a colon to a hyphen to handle windows filesystems 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-29 20:32:20 +01:00
snipe faf2a235fb Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-29 20:31:13 +01:00
snipe 9f99f8275c
Merge pull request #13229 from Godmartinz/status_label_color 
fixed custom fields labels being unreadable
 2023-06-29 20:21:46 +01:00
Godfrey M f83effbb85 removed unnecessary css rule 2023-06-29 11:25:40 -07:00
Godfrey M d4cddebba5 fixes custom fields labels being unreadable 2023-06-29 11:21:21 -07:00
snipe 825e988dfa
Merge pull request #13228 from snipe/bug/sc-23434 
Use proper alias for table scope
 2023-06-29 17:11:50 +01:00
snipe bcefe73c9c Use proper alias for table scope 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-29 16:52:09 +01:00
snipe a3096e1b47
Merge pull request #13219 from inietov/features/cancel_request_asset 
Cancel requested assets without checkin/out [ch-17606]
 2023-06-29 16:18:13 +01:00
snipe 16ce06a3cc
Merge pull request #13222 from snipe/feature/sc-23427 
Fixed #13213 - Use the Helper::parseEscapedMarkedown in notes
 2023-06-29 16:16:25 +01:00
snipe 8be3a6985b
Merge pull request #13227 from snipe/bug/sc-23433 
More reshuffling of scopes in assets API
 2023-06-29 16:10:26 +01:00
snipe 4c3a306a6e More shuffling of scopes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-29 13:35:41 +01:00
snipe f7f2d799f2
Merge pull request #13223 from inietov/fixes/delete_notes_map_from_asset_importer 
Delete notes column map from assets importer
 2023-06-28 20:06:33 +01:00
Ivan Nieto Vivanco a4b8723dcb Delete notes column map from assets importer 2023-06-28 11:38:51 -06:00
Ivan Nieto Vivanco e2c2736a9c Delete (gulp) Form for bulk edit since is not used in this view 2023-06-28 11:23:37 -06:00
Ivan Nieto Vivanco 85e717bc4e Fix cancel button style and translate title 2023-06-28 10:38:44 -06:00
snipe 161f4c8d83
Merge pull request #13045 from akemidx/feature/sc-23261 
Checkin/out info on side bar
 2023-06-28 16:41:21 +01:00
snipe e1fdfd01f6
Merge pull request #13211 from marcusmoore/company-scoping 
Improve testing around company scoping
 2023-06-28 16:17:07 +01:00
snipe 4278471d81
Merge pull request #13207 from Godmartinz/half_year_dep_fix 
adds half_year fix from jdickerson71388
 2023-06-28 15:12:30 +01:00
snipe e3f381a1e1
Merge pull request #13212 from marcusmoore/feature/sc-23419 
Allow running tests in parallel
 2023-06-28 15:12:13 +01:00
snipe 8d8adc1639 Use the Helper::parseEscapedMarkedown in notes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-28 15:02:32 +01:00
snipe a455f67d62
Merge pull request #13216 from marcusmoore/bug/sc-23420 
Fix translation string in user importer
 2023-06-28 07:03:11 +01:00
snipe b6a11cde65
Merge pull request #13218 from marcusmoore/chore/sc-23424 
Have ChipperCI run on each PR
 2023-06-28 07:01:14 +01:00
snipe a8d4494e68
Merge pull request #13220 from marcusmoore/bug/sc-23425 
Add missing relationship check in Asset Transformer
 2023-06-28 06:59:33 +01:00
Marcus Moore ab51857854
Check to see if model relationship exists before using it 2023-06-27 19:35:55 -07:00
Ivan Nieto Vivanco 8496e64e16 Adds ternary to set a quantity when needed 2023-06-27 18:37:22 -06:00
Ivan Nieto Vivanco b4b84f91d0 Redirect to correct page after cancel action 2023-06-27 18:25:38 -06:00
Ivan Nieto Vivanco 1c29bd37a6 Added feature to cancel requests from the Requested Assets view 2023-06-27 18:11:10 -06:00
Marcus Moore 6df7be8c13
Have ChipperCI run on each PR 2023-06-27 16:55:20 -07:00
Ivan Nieto Vivanco eb4d764601 Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want 2023-06-27 17:13:11 -06:00
Ivan Nieto Vivanco b647a8fcd2 Change the inline form HTML label to the Form:: facade 2023-06-27 17:02:25 -06:00
Ivan Nieto Vivanco 62347a56ba Add button with cancel action in requested assets view 2023-06-27 16:41:30 -06:00
Marcus Moore b0177d513a
Fix translation 2023-06-27 12:37:19 -07:00
Marcus Moore 3f09e6017b
Install paratest to allow for parallel test running 2023-06-26 16:22:28 -07:00
Marcus Moore 2abdb8a5fd
Revert unneeded changes 2023-06-26 14:01:09 -07:00