Commit graph

12351 commits

Author SHA1 Message Date
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
spencerrlongg cef1c5d4d2 cleanup test 2023-12-04 12:47:46 -06:00
snipe 09ec8d1d5c 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/mix-manifest.json
2023-12-04 15:42:58 +00: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
spencerrlongg 2d57b9399c more cleanup 2023-11-30 16:20:48 -06:00
spencerrlongg ca8765e1d7 cleaned up 2023-11-30 16:18:50 -06:00
spencerrlongg 6e5f296a13 gets rid of depreciate 2023-11-30 16:08:49 -06:00
spencerrlongg 68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
spencerrlongg 88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
spencerrlongg 133c469e36 organization 2023-11-30 14:25:58 -06: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
spencerrlongg 7e780c1187 cleanup rules formatting 2023-11-30 12:20:02 -06:00
spencerrlongg df954a3af2 return types 2023-11-30 12:06:58 -06:00
spencerrlongg 135b7bde7d added some more check out assertions 2023-11-30 11:53:26 -06: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
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