Commit Graph

23051 Commits

Author SHA1 Message Date
SabreCat f2b9098917 fix(g1g1): launch modal from more banners 2021-11-22 14:57:41 -06:00
Natalie L 9d23d4d215 Merge pull request #13647 from HabitRPG/dependabot/npm_and_yarn/apidoc-0.50.2
build(deps): bump apidoc from 0.50.1 to 0.50.2
2021-11-22 14:39:02 -05:00
Natalie L 85556d314e Merge pull request #13644 from HabitRPG/dependabot/npm_and_yarn/got-11.8.3
build(deps): bump got from 11.8.2 to 11.8.3
2021-11-22 14:37:39 -05:00
Natalie L a44085c067 Merge pull request #13643 from HabitRPG/dependabot/npm_and_yarn/stripe-8.191.0
build(deps): bump stripe from 8.188.0 to 8.191.0
2021-11-22 14:36:49 -05:00
Natalie L 5661f64f1c Merge pull request #13641 from HabitRPG/dependabot/npm_and_yarn/rate-limiter-flexible-2.3.5
build(deps): bump rate-limiter-flexible from 2.3.4 to 2.3.5
2021-11-22 14:35:48 -05:00
Natalie L b1d2d9c3cc Merge pull request #13639 from HabitRPG/dependabot/npm_and_yarn/website/client/amplitude-js-8.12.0
build(deps): bump amplitude-js from 8.10.0 to 8.12.0 in /website/client
2021-11-22 14:34:28 -05:00
Natalie L d59fadd559 Merge pull request #13637 from HabitRPG/dependabot/npm_and_yarn/parse/node-apn-5.1.0
build(deps): bump @parse/node-apn from 4.1.1 to 5.1.0
2021-11-22 14:31:21 -05:00
SabreCat 43945f5187 Merge branch 'release' into develop 2021-11-22 11:27:46 -06:00
dependabot[bot] 02f279e78b build(deps): bump apidoc from 0.50.1 to 0.50.2
Bumps [apidoc](https://github.com/apidoc/apidoc) from 0.50.1 to 0.50.2.
- [Release notes](https://github.com/apidoc/apidoc/releases)
- [Changelog](https://github.com/apidoc/apidoc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apidoc/apidoc/compare/0.50.1...0.50.2)

---
updated-dependencies:
- dependency-name: apidoc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 05:08:49 +00:00
dependabot[bot] 3132050dad build(deps): bump got from 11.8.2 to 11.8.3
Bumps [got](https://github.com/sindresorhus/got) from 11.8.2 to 11.8.3.
- [Release notes](https://github.com/sindresorhus/got/releases)
- [Commits](https://github.com/sindresorhus/got/compare/v11.8.2...v11.8.3)

---
updated-dependencies:
- dependency-name: got
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 05:07:01 +00:00
dependabot[bot] 517e128228 build(deps): bump stripe from 8.188.0 to 8.191.0
Bumps [stripe](https://github.com/stripe/stripe-node) from 8.188.0 to 8.191.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.188.0...v8.191.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 05:06:23 +00:00
dependabot[bot] 51184e13d2 build(deps): bump rate-limiter-flexible from 2.3.4 to 2.3.5
Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases)
- [Commits](https://github.com/animir/node-rate-limiter-flexible/commits)

---
updated-dependencies:
- dependency-name: rate-limiter-flexible
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 05:05:45 +00:00
dependabot[bot] 3dbfb20869 build(deps): bump amplitude-js from 8.10.0 to 8.12.0 in /website/client
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 8.10.0 to 8.12.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases)
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.10.0...v8.12.0)

---
updated-dependencies:
- dependency-name: amplitude-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 05:04:20 +00:00
dependabot[bot] b6b8a73360 build(deps): bump @parse/node-apn from 4.1.1 to 5.1.0
Bumps [@parse/node-apn](https://github.com/parse-community/node-apn) from 4.1.1 to 5.1.0.
- [Release notes](https://github.com/parse-community/node-apn/releases)
- [Changelog](https://github.com/parse-community/node-apn/blob/master/ChangeLog.md)
- [Commits](https://github.com/parse-community/node-apn/compare/4.1.1...5.1.0)

---
updated-dependencies:
- dependency-name: "@parse/node-apn"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-22 05:03:39 +00:00
Natalie L 0a8082cb35 fix: remove Bird Quest Bundle from Featured Quests in Shop (#13635) 2021-11-19 15:36:01 -06:00
CuriousMagpie 5fc26e9497 fix: remove Bird Quest Bundle from Featured Quests in Shop 2021-11-19 14:43:48 -05:00
SabreCat aefe4a6ee3 4.211.8 v4.211.8 2021-11-18 15:19:02 -06:00
SabreCat c6d1954153 Revert "Set cache to private for the language resources"
This reverts commit 90a14ee871.
2021-11-18 15:18:53 -06:00
SabreCat 31469a2d70 Revert "Make the linter happy"
This reverts commit df28670d16.
2021-11-18 15:18:30 -06:00
SabreCat 6475eb4f5c 4.211.7 v4.211.7 2021-11-18 14:52:36 -06:00
SabreCat c7c17dbb55 fix(language): load locale during build of app.vue 2021-11-18 14:52:28 -06:00
SabreCat 30a5c3f91b 4.211.6 v4.211.6 2021-11-18 12:58:51 -06:00
SabreCat 0e507a9c20 Merge branch 'fix_i18n' into release 2021-11-18 12:58:47 -06:00
agares df28670d16 Make the linter happy 2021-11-18 19:28:44 +01:00
agares 90a14ee871 Set cache to private for the language resources 2021-11-18 19:14:00 +01:00
SabreCat ccc6c9ef6c Revert "fix(language): test to see if Axios is the culprit"
This reverts commit d1b537a737.
2021-11-17 13:54:06 -06:00
SabreCat c57ebb5624 4.211.5 v4.211.5 2021-11-17 10:48:05 -06:00
SabreCat d1b537a737 fix(language): test to see if Axios is the culprit 2021-11-17 10:47:58 -06:00
SabreCat b943f4bc7f Revert "fix(language): prefer session data over request data"
This reverts commit 86d6580ffb.
2021-11-17 10:46:46 -06:00
SabreCat 79033af36e Revert "fix(test): skip undesired test"
This reverts commit 93e0d16d5d.
2021-11-17 10:46:08 -06:00
SabreCat 89f449b513 4.211.4 v4.211.4 2021-11-16 16:34:15 -06:00
SabreCat 93e0d16d5d fix(test): skip undesired test 2021-11-16 16:34:09 -06:00
SabreCat 86d6580ffb fix(language): prefer session data over request data 2021-11-16 16:34:01 -06:00
SabreCat 48e3b218fa 4.211.3 v4.211.3 2021-11-16 11:55:20 -06:00
Natalie L 7aecec9cf4 Merge pull request #13628 from HabitRPG/dependabot/npm_and_yarn/rate-limiter-flexible-2.3.4
build(deps): bump rate-limiter-flexible from 2.3.3 to 2.3.4
2021-11-15 13:56:51 -05:00
Natalie L 99c7801a02 Merge pull request #13627 from HabitRPG/dependabot/npm_and_yarn/website/client/amplitude-js-8.10.0
build(deps): bump amplitude-js from 8.9.1 to 8.10.0 in /website/client
2021-11-15 13:56:07 -05:00
Natalie L dbe89a6897 Merge pull request #13626 from HabitRPG/dependabot/npm_and_yarn/stripe-8.188.0
build(deps): bump stripe from 8.186.1 to 8.188.0
2021-11-15 13:55:28 -05:00
dependabot[bot] 3dfb06aca6 build(deps): bump rate-limiter-flexible from 2.3.3 to 2.3.4
Bumps [rate-limiter-flexible](https://github.com/animir/node-rate-limiter-flexible) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/animir/node-rate-limiter-flexible/releases)
- [Commits](https://github.com/animir/node-rate-limiter-flexible/commits/v2.3.4)

---
updated-dependencies:
- dependency-name: rate-limiter-flexible
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 05:04:56 +00:00
dependabot[bot] b84992dd01 build(deps): bump amplitude-js from 8.9.1 to 8.10.0 in /website/client
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 8.9.1 to 8.10.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases)
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v8.9.1...v8.10.0)

---
updated-dependencies:
- dependency-name: amplitude-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 05:04:46 +00:00
dependabot[bot] 7a4b707840 build(deps): bump stripe from 8.186.1 to 8.188.0
Bumps [stripe](https://github.com/stripe/stripe-node) from 8.186.1 to 8.188.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.186.1...v8.188.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-15 05:04:18 +00:00
Sabe Jones b448c721d8 fix(shop): don't show current month's mystery set in time travelers (#13492) 2021-11-12 10:48:07 -06:00
John Bryson 33e35d76a4 selectList spacing (#13329) (#13590)
* Use Flexbox for selectList to get the full width of the selectItems within dropdown
* Add a width to selectDifficulty to avoid visual regression when switching selectList to Flexbox
2021-11-12 10:41:54 -06:00
Jason Carvalho 480a0529a2 Fix logic of emailInvalid and emailValid (#13614)
Fix email validation to return invalid even when 3 characters or less
are present in the input field.
2021-11-12 10:30:31 -06:00
Natalie L 758ad6af8b Merge pull request #13622 from HabitRPG/dependabot/npm_and_yarn/website/client/intro.js-4.3.0
build(deps): bump intro.js from 4.2.2 to 4.3.0 in /website/client
2021-11-10 11:23:39 -05:00
Alys 4951e82c8d add adult term to list of swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2021-11-10 15:05:30 +10:00
dependabot[bot] 7364b2cd97 build(deps): bump stripe from 8.184.0 to 8.186.1 (#13621)
Bumps [stripe](https://github.com/stripe/stripe-node) from 8.184.0 to 8.186.1.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.184.0...v8.186.1)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-09 15:19:10 -06:00
dependabot[bot] fda5a88aa4 build(deps-dev): bump sinon from 11.1.2 to 12.0.1 (#13620)
Bumps [sinon](https://github.com/sinonjs/sinon) from 11.1.2 to 12.0.1.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/master/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v11.1.2...v12.0.1)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-09 15:18:25 -06:00
Weblate 23e2829ffe Merge branch 'origin/develop' into Weblate. 2021-11-09 21:07:08 +01:00
SabreCat 52f6affc3a Merge branch 'release' into develop 2021-11-09 14:06:40 -06:00
SabreCat 46c2040c02 4.211.2 v4.211.2 2021-11-09 14:06:24 -06:00