DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
11999 commits 89 branches 265 tags 290 MiB
Commit graph

11999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M a95f0b8862 remove column sizes 2023-12-05 11:07:52 -08:00
Godfrey M 7a1d5e11cc Merge remote-tracking branch 'origin/add_license_to_info_for_activation' into add_license_to_info_for_activation 2023-12-05 11:07:34 -08:00
Godfrey M 15af64a355 fixed the bootstrap column sizes 2023-12-05 10:07:58 -08:00
Godfrey Martinez dd68182d08
Merge branch 'develop' into add_license_to_info_for_activation 2023-12-04 11:17:07 -08:00
Godfrey M 0e9e31f68b adds info needed for license self activation 2023-12-04 11:12:30 -08:00
snipe 174a3398d1
Merge pull request #13993 from Godmartinz/license_product_key_serial_swap 
Fixed the Column header Serial to Product Key on a User View
 2023-12-04 19:09:03 +00:00
Godfrey M 4fd43799b4 missed one view 2023-12-04 10:56:03 -08:00
snipe 5d60be97af
Merge pull request #13992 from snipe/bug/sc-24182 
Added eula-pdfs to allow-list on restore
 2023-12-04 15:35:34 +00:00
snipe 1e46ecc2ee Added eula-pdfs to allow-list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-04 15:33:56 +00:00
snipe 5730518fc6
Merge pull request #13978 from uberbrady/test_ldap 
Test ldap
 2023-11-30 19:23:29 +00:00
snipe fb1965331c
Merge pull request #13981 from Godmartinz/license-table-header-fix 
Fixed the Column header Serial to Product Key for Licenses
 2023-11-30 18:51:42 +00:00
Godfrey M fdaa44654d changes the table header Serial to Product Key 2023-11-30 10:46:18 -08:00
snipe 1455331a90 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-30 18:25:38 +00:00
snipe 42109dc1eb
Merge pull request #13976 from Godmartinz/sc-24144_final 
Fixed black dark theme, contrast issues etc
 2023-11-30 16:23:13 +00:00
snipe 47c8ae000a
Merge pull request #13975 from ubc-cpsc/bugfix/CVE-2023-49316 
Fixes CVE-2023-49316 by upgrading phpseclib/phpseclib
 2023-11-30 16:22:08 +00:00
Brady Wetherington 5a60df55d1 Add more LDAP tests - including pagination(!) 2023-11-30 16:09:37 +00:00
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
Godfrey M 4a19f23e7c fixes for black dark theme 2023-11-29 11:30:02 -08: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
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 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
akemidx 63065bab5d adding in icons for clarity, since there are two places called settings 2023-11-28 17:51:43 -05:00
akemidx 108658520d translating no group message on user edit page 2023-11-28 17:15:51 -05: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 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
Marcus Moore 72dbe95168
Add table prefix 2023-11-27 15:55:33 -08:00