DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12530 commits 102 branches 268 tags 288 MiB
Commit graph

12530 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington 16da994e28 Add LDAP as 'recommended' requirement; flesh out LDAP tests 2023-11-30 14:00:20 +00:00
Brady Wetherington 2a00dc2d28 Merge branch 'develop' into test_ldap 2023-11-30 12:04:43 +00:00
spencerrlongg 151ceb5fbe get rid of firsts and find by responses id 2023-11-29 17:14:46 -06:00
spencerrlongg d794608a09 note 2023-11-29 15:04:52 -06:00
spencerrlongg c3492f1699 fixed eol, add calculated eol/eol explicit tests 2023-11-29 14:57:31 -06:00
Godfrey M 4a19f23e7c fixes for black dark theme 2023-11-29 11:30:02 -08:00
spencerrlongg 9d8433bd6d a couple quick things 2023-11-29 13:15:41 -06:00
Joël Pittet 5b4d6b346b Update for CVE-2023-49316 by upgrading phpseclib/phpseclib (3.0.14 => 3.0.34) 2023-11-29 11:03:12 -08:00
spencerrlongg 65ca24f6ae asset assigned to asset works now 2023-11-29 11:37:52 -06:00
snipe f004007c47 Merge remote-tracking branch 'origin/develop' 2023-11-29 10:09:27 +00:00
snipe 96210e9498
Merge pull request #13970 from snipe/bug/sc-24149 
Created mutator for requestable attribute
 2023-11-29 10:08:41 +00:00
snipe 3152df2c48 Created mutator for requestable attribute 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-29 10:07:47 +00:00
snipe df2b52c537 Merge remote-tracking branch 'origin/develop' 2023-11-29 09:41:05 +00:00
snipe 189c90e9e5
Merge pull request #13954 from Godmartinz/feature/sc-23756 
Fixed user total asset cost to appear conditionally
 2023-11-29 09:40:39 +00:00
snipe c35d234cde
Merge pull request #13959 from snipe/fixes/rebased_bulk_edit_fix 
Fixed status and model in bulk edit
 2023-11-29 09:40:03 +00:00
snipe 80fafeaebe
Merge pull request #13965 from akemidx/no_group_notice_trans 
Translation of No Group notice on User edit page
 2023-11-29 09:39:28 +00:00
spencerrlongg b17078fffd a couple notes 2023-11-28 22:15:13 -06:00
spencerrlongg c886fb555b checkout on store tests almost done 2023-11-28 22:11:20 -06:00
spencerrlongg 15d11f7f4e test checkout to user on store 2023-11-28 21:46:03 -06:00
spencerrlongg cba5f869c0 standardize some of the validation rules, fix int/string issue 2023-11-28 21:19:19 -06:00
spencerrlongg 4aae82fa38 cleanup validation rules a little 2023-11-28 17:28:17 -06:00
spencerrlongg 5b77e66d28 get rid of deleted_at as it doesn't do anything 2023-11-28 17:16:17 -06:00
Marcus Moore 4a975ebe29
Remove jquery-ui-dist 2023-11-28 15:01:41 -08:00
akemidx 63065bab5d adding in icons for clarity, since there are two places called settings 2023-11-28 17:51:43 -05:00
Marcus Moore 810abb5c30
Replace jquery-ui-bundle with jquery-ui-dist 2023-11-28 14:24:21 -08:00
akemidx 108658520d translating no group message on user edit page 2023-11-28 17:15:51 -05:00
spencerrlongg 75ac7f80b9 some refactor + tests 2023-11-28 15:17:46 -06:00
Godfrey M 9e59550b79 removes the row instead of just the optional values 2023-11-28 10:08:32 -08:00
snipe 899890b224 Use update array nomenclature 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:25:35 +00:00
snipe 7ac3341b4f
Merge pull request #13955 from marcusmoore/bug/sc-24137 
Fixed sqlite exception in migration
 2023-11-28 16:13:10 +00:00
snipe d4fb7ac403 Merge remote-tracking branch 'origin/develop' 2023-11-28 16:11:01 +00:00
snipe 9d5ceb685d
Merge pull request #13958 from uberbrady/encryption_key_rotator 
Modified re-crypter to also work when given a CLI old-key
 2023-11-28 16:10:45 +00:00
snipe 601ebcc1e6 Removed table header contraint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:00:42 +00:00
snipe 2247be77d8 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:56:20 +00:00
snipe 2d4a14d4bb Fixed from rebase :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:55:41 +00:00
snipe 3b9f069627 Switched back to old version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:54:42 +00:00
snipe 2c6b957fbe Removed unused query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:28:37 +00:00
snipe 6ae03a204b Added the model info back in 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:21:14 +00:00
snipe 187d3abeb4 Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:15:07 +00:00
snipe c91713e20a Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:55 +00:00
snipe fa1176ce14 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:12 +00:00
Brady Wetherington c71726c83e Whoops, left in some debug lines 2023-11-28 13:52:07 +00:00
Brady Wetherington ca430ec9b3 Modified re-crypter to also work when given a CLI old-key 2023-11-28 13:49:58 +00:00
snipe 9d786d9386 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:43:33 +00:00
snipe 4723cfd4ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe f9d5c451bc Committing this for now - not done 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe 5574218966 More FAFO - cleanup needed, but model_id works now 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe c997ae44c2 FAFO troubleshooting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
Marcus Moore 77ceac5747
Update docblock 2023-11-27 16:36:51 -08:00
Marcus Moore 990358750b
Add migration for postgres 2023-11-27 16:33:57 -08:00