DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13111 commits 97 branches 266 tags 291 MiB
Commit graph

13111 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 1aeaa0094a
Fix assigned to in labels 2024-04-09 13:52:54 -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
snipe 545a185614
Merge pull request #14262 from akemidx/bug/sc-24812 
Last Checkin Date added to Hardware View and Index
 2024-03-27 19:02:25 +00:00
snipe 1572e339f9
Merge pull request #14514 from snipe/localizations/new_translations_march_224 
Updated translations
 2024-03-27 19:01:23 +00:00
snipe 7782e5cc93 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 18:59:28 +00:00
snipe 756c44fcba
Merge pull request #14510 from snipe/snyk/Upgrade-alpinejs-from-3.13.5-to-3.13.6 
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.6
 2024-03-27 16:14:53 +00:00
snipe befa4428d0
Merge pull request #14509 from snipe/feature/sc-25173/filter_assigned_user_assets_by_category_id 
Added ability to filter in user's assigned assets by category ID and model ID
 2024-03-27 16:13:51 +00:00
snipe 60c678680a [Snyk] Upgrade alpinejs from 3.13.5 to 3.13.6 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 16:12:57 +00:00
snipe 8bc9688d71 Added ability to filter on category ID and model ID from user’s asset API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 16:04:00 +00:00
akemidx b124b9af4d adding in change to settings table 2024-03-26 16:50:39 -04:00
snipe ae403da8c1
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation 
Added validation around `pwd_secure_complexity`
 2024-03-26 20:05:04 +00:00
Marcus Moore b5b8777c94
Extract translation string 2024-03-26 12:23:57 -07:00
snipe 850f85ff59
Merge pull request #14369 from spencerrlongg/bug/sc-24343 
Add new validator for custom field checkboxes and fix asset model default updates
 2024-03-26 19:22:29 +00:00
Godfrey M 84cc88831d adds signature for components 2024-03-26 12:18:10 -07:00
Godfrey M f4f9b165a7 moves signature check inside of td 2024-03-26 11:24:34 -07:00
Godfrey M 3222d4c8df adds signature check 2024-03-26 09:18:34 -07:00
Godfrey M 3173ead2e7 adds accessory signature to user print report 2024-03-26 09:11:54 -07:00
snipe df49e8350f
Merge pull request #14498 from snipe/features/limit_report_by_admin 
Fixed #14495 - Allow user_id to be passed to limit to only specific admins
 2024-03-26 14:52:03 +00:00
snipe 3ced85080a Fixed #14495 - Allow user_id to be passed to limit to only specific admins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 14:45:20 +00:00
snipe f450cafe3e Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:29:25 +00:00