Commit Graph

3000 Commits

Author SHA1 Message Date
TheArcaneBrony 2a559166bb Merge remote-tracking branch 'upstream/dev/staging_2' into staging 2022-08-27 04:03:18 +02:00
TheArcaneBrony 355b8f1d81 Merge remote-tracking branch 'Maddy/fix/sendMemberInProfile' into staging 2022-08-27 04:01:05 +02:00
TheArcaneBrony 204aa024dc Merge remote-tracking branch 'Maddy/fix/claim_accounts' into staging 2022-08-27 03:58:16 +02:00
TheArcaneBrony ec3f088c06 Merge remote-tracking branch 'Maddy/fix/categoryNames' into staging 2022-08-27 03:50:33 +02:00
TheArcaneBrony 15a9a8f7a0 Configurable backup code length 2022-08-27 03:40:42 +02:00
TheArcaneBrony 2a553e2ef9 Add missing SKU 2022-08-27 03:40:42 +02:00
TheArcaneBrony 48be9bddba Dont even bother loading mappings for assets. 2022-08-27 03:40:42 +02:00
TheArcaneBrony 57583d049a Configurable MFA backup token length 2022-08-27 03:40:42 +02:00
Madeline d946547a92 Merge remote-tracking branch 'upstream/staging' into fix/categoryNames
Also allow voice to skip checks
2022-08-25 13:00:31 +10:00
TheArcaneBrony e1b313bd1b Merge pull request #799 from MaddyUnderStars/feat/captchaVerify
Captcha verification
2022-08-24 20:40:13 +02:00
TheArcaneBrony baeec00f65 case insensitive header for rate limits, fix rate limit default settings
Also disabled rate limit bypass right as it doesn't work...
2022-08-24 16:57:10 +02:00
Madeline 314a4787ce Merge remote-tracking branch 'upstream/staging' into feat/captchaVerify 2022-08-25 00:44:13 +10:00
TheArcaneBrony 401eda069a case insensitive header for rate limits, fix rate limit default settings
Also disabled rate limit bypass right as it doesn't work...
2022-08-24 03:07:14 +02:00
Scott Gould 89ac7f2ce4 Check Captcha 2022-08-23 22:44:28 +02:00
TheArcaneBrony ba0ba4b61e Merge branch 'dev/cherry-plugins-improvements' into staging 2022-08-23 19:02:05 +02:00
TheArcaneBrony e0e0b74788 New db migration script - multiplatform, fix mariadb migrations 2022-08-23 19:00:40 +02:00
Madeline 0cd9a46eea Merge remote-tracking branch 'upstream/staging' into feat/captchaVerify 2022-08-22 22:18:59 +10:00
Madeline 8720744091 Merge remote-tracking branch 'upstream/staging' into fix/sendMemberInProfile 2022-08-22 22:16:11 +10:00
Madeline afefa5d64b Merge remote-tracking branch 'upstream/staging' into fix/categoryNames 2022-08-22 22:12:00 +10:00
Madeline 975c414434 Merge remote-tracking branch 'upstream/staging' into fix/claim_accounts 2022-08-22 22:08:22 +10:00
TheArcaneBrony 674fa8364e Improve first setup, make server load initial configuraiton 2022-08-20 19:26:20 +02:00
TheArcaneBrony 5ffaaf771e Disable yarn PnP 2022-08-20 18:26:44 +02:00
TheArcaneBrony 04dea8d788 prettier 2022-08-20 03:27:03 +02:00
TheArcaneBrony 363d9887cf Fix merge conflicts 2022-08-20 03:25:08 +02:00
TheArcaneBrony c0cdfd332c Make canvas optional 2022-08-20 03:18:41 +02:00
TheArcaneBrony 3795c67723 Add fallback to bcryptjs 2022-08-20 03:17:44 +02:00
TheArcaneBrony 0232c592ed Drop ajv patch, update setup script 2022-08-20 03:14:11 +02:00
TheArcaneBrony 9071cbdc25 Updates scripts and tests from dev/plugins 2022-08-19 19:07:10 +02:00
TheArcaneBrony 359d828935 Merge remote-tracking branch 'Puyodead1/patch/prettier-config' into staging 2022-08-18 22:27:14 +02:00
TheArcaneBrony 305e3a5d74 Merge remote-tracking branch 'upstream/translation' into staging 2022-08-18 22:22:45 +02:00
David Sundberg 6fb3e77397 Create docker-compose-dev.yml 2022-08-17 17:54:53 +03:00
Puyodead1 f070bac69a remove duplicate key 2022-08-17 02:10:10 -04:00
Erkin Alp Güney 03ba7e40c5 Fix the latest SKU errors and further debranding 2022-08-16 19:17:44 +03:00
Samuel c0f3c91b71 New translations common.json (Russian) 2022-08-15 19:27:29 +03:00
Samuel 246bdb2d8f New translations auth.json (Russian) 2022-08-15 19:27:29 +03:00
Samuel c85671f53a New translations common.json (Belarusian) 2022-08-15 19:27:29 +03:00
Samuel 8e3e28040b New translations auth.json (Belarusian) 2022-08-15 19:27:29 +03:00
Samuel 517aad85d6 New translations common.json (Dutch) 2022-08-15 19:27:29 +03:00
Samuel d6c00709c5 New translations auth.json (Dutch) 2022-08-15 19:27:29 +03:00
Samuel fd52864093 New translations common.json (German) 2022-08-15 19:27:29 +03:00
Samuel 9d14557518 New translations auth.json (German) 2022-08-15 19:27:29 +03:00
TheArcaneBrony 1a94fb1208 Merge branch 'dev/restructure' into staging 2022-08-15 11:13:21 +02:00
TheArcaneBrony 15b1dee513 change dev panel path, we missed this one... 2022-08-15 10:02:26 +02:00
TheArcaneBrony 6d9ea1a7bc Fix nullables, fix user settings hanging stuff 2022-08-15 09:47:49 +02:00
TheArcaneBrony 95108eedf0 oops.. move migrations to right folder 2022-08-15 07:54:00 +02:00
TheArcaneBrony 551fa530cf Update package, sync migrations 2022-08-15 07:16:41 +02:00
TheArcaneBrony fcef1f4d27 Fix missing stuff 2022-08-15 06:22:22 +02:00
TheArcaneBrony 79d97a9252 Update db migration script 2022-08-15 06:14:02 +02:00
TheArcaneBrony 6d3706c2c8 Fix rebase conflicts 2022-08-15 06:13:50 +02:00
TheArcaneBrony 5e629decfc Do the funny thing (make user->invite cascade delet) 2022-08-15 06:13:39 +02:00