DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
13249 commits 96 branches 267 tags 295 MiB
Commit graph

13249 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
akemidx f0aefaac42 padding fix 2024-04-09 17:51:42 -04:00
Marcus Moore 1aeaa0094a
Fix assigned to in labels 2024-04-09 13:52:54 -07:00
akemidx 6d3fa12f37 white texty for dropdown lists 2024-04-09 14:52:43 -04:00
Godfrey M 052f1eedd0 fixes signature canvas refresh on mobile 2024-04-09 10:30:33 -07:00
Godfrey M 858da800be attempting to lock screen orientation 2024-04-09 09:40:39 -07:00
snipe 954cac3af7 Merge remote-tracking branch 'origin/develop' 2024-04-08 10:56:04 +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 802b5863ab Merge remote-tracking branch 'origin/develop' 2024-04-08 08:49:54 +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
akemidx f7f199d929 black hover bg for dark yellow theme 2024-04-04 15:51:46 -04:00
akemidx 5519fddb78 new clean branch for color change 2024-04-04 15:50:30 -04: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 72c91ead8b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-04-04 15:06:37 +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 4f10adfb76 Merge remote-tracking branch 'origin/develop' 2024-04-04 14:27:35 +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 d44202e55b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-04-03 13:09:48 +01:00
snipe df95447ea4 New dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-03 13:08:08 +01:00