DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 10:34:08 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
14368 commits 96 branches 267 tags 295 MiB
Commit graph

14368 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington 266424ff0e Some simple renames for better readability as suggested by Marcus 2024-04-16 15:17:02 +01:00
snipe a8d48b758e
Merge pull request #14594 from marcusmoore/bug/sc-25314/multiple-label-fields-on-one-row 
Fixed label fields only showing first option
 2024-04-15 18:53:03 +01:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
snipe 7b7d424962
Merge pull request #13880 from Godmartinz/department-validation-bug 
Fixed department validation to allow updates
 2024-04-12 10:50:26 +01:00
Marcus Moore a4e959818a
Add comment 2024-04-11 17:23:28 -07:00
Marcus Moore c3a71cc182
Improve variable names and add comment 2024-04-11 16:44:13 -07:00
Marcus Moore da03cfdbe5
Formatting 2024-04-11 16:39:29 -07:00
Marcus Moore 2b137d76fa
Trim string to avoid leading whitespace if label is empty 2024-04-11 16:38:22 -07:00
Marcus Moore 81b8c111ca
Allow multiple fields to be displayed in one row 2024-04-11 15:00:14 -07:00
snipe fce98b9ca4 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2024-04-11 18:58:50 +01:00
snipe c0dcae16f7 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 18:57:06 +01:00
snipe c604f08749 Small tweaks for troubleshooting :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 18:47:55 +01:00
snipe da21424416
Merge pull request #14581 from marcusmoore/bug/sc-25237 
Fixed assigned to field in new label engine
 2024-04-11 15:36:18 +01:00
snipe b5c83721ad
Merge pull request #14577 from Godmartinz/signature_pad_upgrade 
Upgraded Signature-pad.js  && Fixed Resizing Canvas on mobile
 2024-04-11 15:35:47 +01:00
snipe 9b21fca1a0
Merge pull request #14558 from akemidx/bug/sc-25192 
Fixed: Header Dropdown Menus had no hover coloring in dark themes
 2024-04-11 15:35:33 +01:00
snipe af94b07771
Merge pull request #14582 from akemidx/feature/sc-25288 
Reduce Extra Space in Header Dropdown
 2024-04-11 15:35:11 +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
Marcus Moore 5567a1e9ac
Formatting 2024-04-10 17:37:11 -07:00
Marcus Moore fa5016713f
Implement test 2024-04-10 17:29:44 -07:00
Marcus Moore f28a82de71
Implement some tests, scaffold others 2024-04-10 17:27:07 -07:00
Marcus Moore 7c2fae7b9d
Scaffold api test cases 2024-04-10 17:08:45 -07:00
Marcus Moore 70934e54cf
Remove unneeded comment 2024-04-10 16:34:14 -07:00
Marcus Moore f6ad275030
Clean ups 2024-04-10 16:28:48 -07:00
Marcus Moore 6666a78936
Organization 2024-04-10 16:19:04 -07:00
Marcus Moore bbb2cdcceb
Add note 2024-04-10 16:15:43 -07:00
Marcus Moore 6b6e18695f
Account for null asset in factory state 2024-04-10 16:12:47 -07:00
Marcus Moore b63962e90b
Add additional assertions 2024-04-10 16:01:15 -07:00
Marcus Moore 4434de6241
Add test case 2024-04-10 15:47:26 -07:00
Godfrey M a2bca0e358 fixed comments 2024-04-10 15:05:21 -07:00
Marcus Moore 6d572424ac
Add validation around dates 2024-04-10 14:02:25 -07:00
Marcus Moore d371d14c1f
Implement test 2024-04-10 13:49:07 -07:00
Marcus Moore 72eda1e909
Improve naming 2024-04-10 13:29:31 -07:00
Marcus Moore 7dbf8a8a8e
Add tests for asset and location check out 2024-04-10 13:28:52 -07:00
Godfrey M 133fdd7a37 fix conditional 2024-04-10 12:31:04 -07:00
Godfrey M 0849262243 fixed notes 2024-04-10 12:19:34 -07:00
Godfrey M 17095feb33 fix typo 2024-04-10 12:15:48 -07:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
Marcus Moore 37ebf1827f
Organization 2024-04-10 12:12:44 -07:00
Marcus Moore e65252725a
Add simple test for LogListener 2024-04-10 11:52:59 -07:00
Marcus Moore 6f53f2ac64
Finish implementing test case 2024-04-10 11:43:50 -07:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07:00
Marcus Moore deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-04-10 11:01:35 -07:00