DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14320 commits 96 branches 267 tags 296 MiB
Commit graph

14320 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 08f9aae8ae adds note to log listener and checkout accept notif 2024-04-03 11:59:47 -07:00
Godfrey M 43c32fa1bf fix class name in migration 2024-04-03 11:47:08 -07:00
Godfrey M 5afe024644 changed translation on asset acceptancen blade 2024-04-03 11:40:48 -07:00
Godfrey M c01bdb42fc renamed migration 2024-04-03 11:39:17 -07:00
Godfrey M e3ef8d295f Merge remote-tracking branch 'origin/add_decline_note_to_acceptance' into add_decline_note_to_acceptance 2024-04-03 11:37:05 -07:00
Godfrey M ce1d677cdc adds note to acceptance 2024-04-03 11:36:03 -07:00
Godfrey M df5cacf8a2 removed front end if statement 2024-04-03 11:06:05 -07:00
Godfrey M bb2c73348d only grabs custom Fields that are not encrpyted 2024-04-03 11:03:58 -07:00
Godfrey M 4327653d70 remove db cleaner for encrypted selections 2024-04-03 10:57:41 -07: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
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
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +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 b7af049589 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-03-29 13:20:22 +00:00
snipe c2d863da99 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-29 13:19:22 +00:00
snipe 6f9ba6ede4 Merge remote-tracking branch 'origin/develop' 2024-03-29 12:49: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 d60fa65f85 Merge remote-tracking branch 'origin/develop' 2024-03-28 21:59:36 +00:00