DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
13129 commits 90 branches 265 tags 290 MiB
Commit graph

13129 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe ab3b5ca4ef Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 09:26:07 +01:00
snipe c604f08749 Small tweaks for troubleshooting :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 18:47:55 +01:00
snipe 0d23d28a65 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 15:15:56 +01:00
snipe 710370ac24 Added scoping for destroy 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:58:25 +01:00
snipe ed0a441e4d Refactor destroy method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:52:03 +01:00
snipe 24e87cc0bb Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:51:49 +01:00
snipe 460693c153 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:13 +01:00
snipe f54a94bd4c Refactorered methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:00 +01:00
snipe a19b86add0 Re-ordered scoping for admins, added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:39:37 +01:00
snipe 570944a48b Updated translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:38:52 +01:00
snipe 5829b02323 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:38:47 +01:00
snipe 989dab6259 Moved company scoping methods to group them together 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-10 14:35:13 +01:00
snipe adacdc038d Apply company scoping for users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-10 12:34:32 +01:00
snipe d0f171ebc6
Merge pull request #14567 from snipe/bug/sc-25257 
Remove city as required field on location modal
 2024-04-08 10:54:09 +01:00
snipe 90cf612ac7 Remove city as required field on location modal 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-08 10:50:52 +01:00
snipe 4baa949a99
Merge pull request #14557 from Godmartinz/add-audit-date-to-labels 
Added audit dates to label options
 2024-04-08 04:59:53 +01:00
snipe 3bed04a6d3
Merge pull request #14559 from Godmartinz/ldap_location_bug 
Fixed  ldap location syncing incorrect locations for users.
 2024-04-08 04:59:27 +01:00
Godfrey M d548b800d5 nullifies location after ldap user sync 2024-04-04 15:43:33 -07:00
Godfrey M a9ed748fb2 adds audit dates to label options 2024-04-04 11:39:49 -07:00
snipe dcba2bfd25
Merge pull request #14529 from mauro-miatello/develop 
Hide/Show encrypted values in hardware list
 2024-04-04 15:07:58 +01:00
snipe 774d0aa90c Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 15:05:35 +01:00
snipe 2eea67ce34
Merge pull request #14547 from Godmartinz/user-dropdown-media-change 
Fixed alignment of dropdown menu for user in nav bar
 2024-04-04 15:04:36 +01:00
snipe db1c44f921
Merge pull request #14552 from snipe/bug/sc-25229/redirect_if_already_checked_in 
Redirect on checkin if the asset is already checked in
 2024-04-04 15:01:43 +01:00
snipe e11287ec25 Redirect on checkin if the asset is already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 15:00:55 +01:00
snipe f22803c59f
Merge pull request #14551 from snipe/bug/sc-25221/ambiguous_id_in_custom_report 
Fixed ambiguous id clause in custom report
 2024-04-04 14:25:43 +01:00
snipe a72d4e5dc1 Fixed ambiguous id clause in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 14:23:58 +01:00
Godfrey M 5f7f4c9b91 aligns dropdown menu for user in nav 2024-04-03 10:41:50 -07:00
snipe df95447ea4 New dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-03 13:08:08 +01:00
snipe 01852c7188
Merge pull request #14520 from Godmartinz/loading_overlap_bug 
fixes z-index of table load
 2024-04-03 13:07:14 +01:00
snipe 79c5697042 Fixed dev - take 2! 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-03 13:06:49 +01:00
MrM 658ba092e2
Hide encrypted values in hardware list 
Encrypted values are now hidden also in hardware list, clicking on them show the decrypted value
 2024-03-31 18:55:58 +02:00
MrM b221d99e7b
Encrypted values enhancement 
Show asterisks instead of the value, respecting the length of the field
 2024-03-31 12:27:35 +02:00
snipe c2d863da99 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-29 13:19:22 +00:00
snipe df4e6a0023 Fixed typo in Polish 
I will fix this in CrowdIn shortly

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-29 12:47:43 +00:00
snipe 8081a82fe4 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-03-28 21:58:58 +00:00
snipe f42e5d5292 Reverting the store/update asset API responses for now 
This currently breaks the Jamf integration - need a better longer term plan.

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 21:58:49 +00:00
snipe 5a3f5b03d0
Merge pull request #14456 from akemidx/feature/sc-25079/legacy-locations 
Default Locale value changed to en-US
 2024-03-28 21:47:40 +00:00
Godfrey M a450530c74 fixes z-index of table load 2024-03-28 11:44:55 -07:00
snipe 2b4886f37f
Commented out Heroic deploy for now 2024-03-28 17:43:18 +00:00
snipe b45de3e17f
Update README.md 
Added alert notations
 2024-03-28 17:41:46 +00:00
snipe f411c0fdd8
Merge pull request #14518 from snipe/fixes/downgrade_alpine 
Downgrade alpine to 3.13.5
 2024-03-28 12:59:52 +00:00
snipe 74d8431d01 Downgrade alpine to 3.13.5 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 12:58:43 +00:00
snipe 5f6c746d25
Merge pull request #14517 from snipe/bug/sc-25186/label_index 
Check that the array key exists in the label engine
 2024-03-28 12:26:20 +00:00
snipe 1f2d30ebf4 Check that the array key exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 12:25:29 +00:00
snipe e5800a2dac
Merge pull request #14516 from snipe/fixes/fixed_sorting_on_last_checkin_assets_api 
Fixes/fixed sorting on last checkin assets api
 2024-03-27 20:39:12 +00:00
snipe 0d3d172108 Make last_checkin searchable and fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:40 +00:00
snipe 86677b5f13 Make last_checkin sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:25 +00:00
snipe cf8cb8521b
Merge pull request #14515 from squintfox/fixes-results-not-limited-by-api-params 
Fixes #14289: /reports/activity API endpoint returns too many results due to orwhere
 2024-03-27 19:51:58 +00:00
Robert Spadaro ccd00caa70 Wrap where logic in additional where statement to protect appended params 2024-03-27 15:36:00 -04:00
snipe 57010b4c23
Merge pull request #14500 from Godmartinz/add-accessory-signature-to-print-all 
Added signature to user print report for Accessories and Consumables
 2024-03-27 19:02:59 +00:00