Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,054 Commits 64 Branches 1,256 Tags
e25922f8b33f3dad2b13110d6fdbaba2a67d87f0
Commit Graph

24054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot] 9eb959840b build(deps): bump @storybook/addon-actions in /website/client (#14028) 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 6.4.19 to 6.5.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/actions)

---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
  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>
 2022-06-03 14:26:24 -04:00
dependabot[bot] 7d11b22da0 build(deps): bump @storybook/addon-links in /website/client (#14025) 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.4.18 to 6.5.6.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/links)

---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
  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>
 2022-06-03 14:26:00 -04:00
dependabot[bot] f3495ba4e1 build(deps): bump jwks-rsa from 2.1.2 to 2.1.3 (#13985) 
Bumps [jwks-rsa](https://github.com/auth0/node-jwks-rsa) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/auth0/node-jwks-rsa/releases)
- [Changelog](https://github.com/auth0/node-jwks-rsa/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jwks-rsa/compare/v2.1.2...v2.1.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-03 14:25:10 -04:00
dependabot[bot] dd978b664b build(deps): bump passport from 0.5.0 to 0.6.0 (#13987) 
Bumps [passport](https://github.com/jaredhanson/passport) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/jaredhanson/passport/releases)
- [Changelog](https://github.com/jaredhanson/passport/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jaredhanson/passport/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: passport
  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>
 2022-06-03 14:24:41 -04:00
dependabot[bot] 84011f36b2 build(deps): bump moment from 2.29.1 to 2.29.3 in /website/client (#13994) 
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.3.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-03 14:24:17 -04:00
dependabot[bot] b9389f8430 build(deps): bump intro.js from 5.0.0 to 5.1.0 in /website/client (#13999) 
Bumps [intro.js](https://github.com/usablica/intro.js) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/usablica/intro.js/releases)
- [Commits](https://github.com/usablica/intro.js/compare/v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: intro.js
  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>
 2022-06-03 14:23:55 -04:00
dependabot[bot] 266ea01bc8 build(deps): bump @vue/cli-plugin-eslint in /website/client (#14000) 
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.5.15 to 4.5.17.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.17/packages/@vue/cli-plugin-eslint)

---
updated-dependencies:
- dependency-name: "@vue/cli-plugin-eslint"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-03 14:23:35 -04:00
dependabot[bot] c170edae92 build(deps): bump bootstrap-vue from 2.21.2 to 2.22.0 in /website/client (#14002) 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.21.2 to 2.22.0.
- [Release notes](https://github.com/bootstrap-vue/bootstrap-vue/releases)
- [Changelog](https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.21.2...v2.22.0)

---
updated-dependencies:
- dependency-name: bootstrap-vue
  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>
 2022-06-03 14:23:13 -04:00
dependabot[bot] 324076438c build(deps): bump core-js from 3.21.0 to 3.22.7 in /website/client (#14004) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.21.0 to 3.22.7.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.21.0...v3.22.7)

---
updated-dependencies:
- dependency-name: core-js
  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>
 2022-06-03 14:22:30 -04:00
dependabot[bot] 77791e186f build(deps-dev): bump @babel/plugin-proposal-optional-chaining (#14009) 
Bumps [@babel/plugin-proposal-optional-chaining](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-optional-chaining) from 7.16.7 to 7.17.12.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.12/packages/babel-plugin-proposal-optional-chaining)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-optional-chaining"
  dependency-type: direct:development
  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>
 2022-06-03 14:19:40 -04:00
dependabot[bot] b3a9e79f0d build(deps): bump smartbanner.js in /website/client (#14011) 
Bumps [smartbanner.js](https://github.com/ain/smartbanner.js) from 1.17.0 to 1.19.0.
- [Release notes](https://github.com/ain/smartbanner.js/releases)
- [Commits](https://github.com/ain/smartbanner.js/compare/v1.17.0...v1.19.0)

---
updated-dependencies:
- dependency-name: smartbanner.js
  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>
 2022-06-03 14:18:56 -04:00
SabreCat ce67f06bab fix(chat): test expectation, short circuit if no group 2022-06-02 16:43:14 -05:00
SabreCat 219bdc088b feat(chat): don't check for slurs in private chats 2022-06-02 16:16:40 -05:00
dependabot[bot] ac972fb481 build(deps): bump eventsource from 1.1.0 to 1.1.1 in /website/client (#14031) 
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: eventsource
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-01 15:41:31 -04:00
SabreCat c98c7ab26c Merge branch 'develop' into sabrecat/teams-rebase 2022-05-31 15:51:16 -05:00
SabreCat 5a0813fe7f fix(lint): line length 2022-05-31 15:34:44 -05:00
SabreCat d3673349a9 Merge branch 'release' into develop 2022-05-31 13:58:07 -05:00
SabreCat 8125bea89f 4.232.1 v4.232.1 2022-05-31 10:38:29 -05:00
SabreCat e16c12fc7f Revert "Gifting Modal Redesign (#13964)" 
This reverts commit 761d70ec55.
 2022-05-31 10:38:14 -05:00
SabreCat 90e03653ce 4.232.0 v4.232.0 2022-05-30 15:58:29 -05:00
Natalie L dd5066ab72 2022-06 Subscriber Items (#14016) 
* 2022-06 Subscriber Items

* chore(mystery): compile sprites, tidy up whitespace

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-30 15:56:50 -05:00
Tressley Cahill ec0be8d91f Adjust z-index for notifications 
Fixes #14015
 2022-05-25 11:09:43 -04:00
SabreCat 1ef7924ba5 Merge branch 'develop' into sabrecat/teams-rebase 2022-05-24 09:39:01 -05:00
SabreCat 331c64a83a Merge branch 'release' into develop 2022-05-24 09:38:40 -05:00
SabreCat f8c6a859bf 4.231.0 v4.231.0 2022-05-24 09:37:35 -05:00
Natalie L 8040d14c28 code for reptacular rumble achievement (#13981) 2022-05-23 15:39:51 -05:00
SabreCat 8358da227d fix(quests): hide offseason quests, again 
Also tidy up some Reptacular Rumble issues
 2022-05-23 15:38:16 -05:00
SabreCat 74b59d2324 chore(packages): lock cleanup 2022-05-23 14:59:15 -05:00
CuriousMagpie 5fa705c390 code for reptacular rumble achievement 2022-05-23 14:58:17 -05:00
SabreCat 5bcfdbe066 fix(login): catch double-slash exploit 2022-05-20 14:29:15 -05:00
dependabot[bot] 0e7f98ad14 build(deps): bump jwks-rsa from 2.1.1 to 2.1.2 (#13976) 
Bumps [jwks-rsa](https://github.com/auth0/node-jwks-rsa) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/auth0/node-jwks-rsa/releases)
- [Changelog](https://github.com/auth0/node-jwks-rsa/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jwks-rsa/compare/v2.1.1...v2.1.2)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-19 15:43:21 -05:00
Vanathi G 9ba0bd7c06 Keys to kennel issue (#13978) 
* Fix selection highlight in avatar editor

* Fix error message on using Keys to the Kennel
 2022-05-19 15:37:15 -05:00
dependabot[bot] 5d78fce468 build(deps): bump glob from 8.0.1 to 8.0.3 (#13974) 
Bumps [glob](https://github.com/isaacs/node-glob) from 8.0.1 to 8.0.3.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v8.0.1...v8.0.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-19 15:33:41 -05:00
Sabe Jones 31385b3e7b fix(auth): take best guess when multiple accts with same email (#13980) 
Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-19 15:32:03 -05:00
SabreCat 1863a965c7 4.230.3 v4.230.3 2022-05-19 14:55:09 -05:00
SabreCat 7651e6a540 Merge branch 'develop' into sabrecat/teams-rebase 2022-05-19 14:30:29 -05:00
SabreCat bb20c44fde fix(needs-work): don't show Gold/Experience depletion for manager 2022-05-19 14:28:35 -05:00
Weblate 1f2c926a54 Translated using Weblate (Japanese) 
Currently translated at 98.5% (200 of 203 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (697 of 697 strings)

Translated using Weblate (Latin)

Currently translated at 19.4% (35 of 180 strings)

Translated using Weblate (Latin)

Currently translated at 99.2% (130 of 131 strings)

Translated using Weblate (Latin)

Currently translated at 87.5% (7 of 8 strings)

Translated using Weblate (Latin)

Currently translated at 42.3% (47 of 111 strings)

Translated using Weblate (Latin)

Currently translated at 42.3% (47 of 111 strings)

Translated using Weblate (Latin)

Currently translated at 19.4% (35 of 180 strings)

Translated using Weblate (Latin)

Currently translated at 98.3% (60 of 61 strings)

Translated using Weblate (Italian)

Currently translated at 99.0% (201 of 203 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (366 of 366 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (366 of 366 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (755 of 755 strings)

Translated using Weblate (Japanese)

Currently translated at 99.7% (695 of 697 strings)

Translated using Weblate (English (United Kingdom))

Currently translated at 97.7% (128 of 131 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (56 of 56 strings)

Translated using Weblate (Croatian)

Currently translated at 12.6% (14 of 111 strings)

Co-authored-by: Altariel <altariel.habitica@gmail.com>
Co-authored-by: Simon Coast <shimmumah@mailfence.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Co-authored-by: xioxi <potentiallytyler@gmail.com>
Co-authored-by: そら <comi4work@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/en_GB/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/la/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/front/la/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/it/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/la/
Translate-URL: https://translate.habitica.com/projects/habitica/messages/la/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/hr/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/la/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/it/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/it/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Groups
Translation: Habitica/Inventory
Translation: Habitica/Messages
Translation: Habitica/Pets
Translation: Habitica/Questscontent
Translation: Habitica/Subscriber
 2022-05-19 17:49:48 +02:00
SabreCat e7f60cb68f fix(achievements): TigerCub not Tiger, sigh 2022-05-18 14:43:10 -05:00
SabreCat d1cb86a428 revert package updates 2022-05-18 14:40:35 -05:00
SabreCat 6f6c981c92 chore(packages): update gulp.spritesmith and istanbul 2022-05-17 15:56:37 -05:00
SabreCat eb99ca0411 fix(cron): reset completions even if Daily wasn't due 2022-05-17 14:02:18 -05:00
Weblate 63bb2b31bc Merge branch 'origin/develop' into Weblate. 2022-05-17 16:41:00 +02:00
Weblate b42ac207b2 Translated using Weblate (Croatian) 
Currently translated at 19.8% (26 of 131 strings)

Translated using Weblate (Filipino)

Currently translated at 66.2% (1718 of 2593 strings)

Translated using Weblate (Spanish (Latin America))

Currently translated at 100.0% (134 of 134 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (2593 of 2593 strings)

Translated using Weblate (Spanish)

Currently translated at 98.6% (2558 of 2593 strings)

Translated using Weblate (Filipino)

Currently translated at 65.1% (1690 of 2593 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (2589 of 2593 strings)

Translated using Weblate (Spanish)

Currently translated at 98.6% (2558 of 2593 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 96.7% (674 of 697 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (697 of 697 strings)

Translated using Weblate (Croatian)

Currently translated at 68.5% (37 of 54 strings)

Translated using Weblate (Filipino)

Currently translated at 62.6% (1625 of 2593 strings)

Translated using Weblate (Croatian)

Currently translated at 38.8% (21 of 54 strings)

Translated using Weblate (Filipino)

Currently translated at 62.9% (1632 of 2593 strings)

Co-authored-by: Céu <marcel.ufscar@gmail.com>
Co-authored-by: Ike Osenberg <ike.osenberg@gmail.com>
Co-authored-by: JMFO16 <fournier.olivera.jm@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Vince Vilan <vincemorel.vilan.889@my.csun.edu>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Co-authored-by: xioxi <potentiallytyler@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/hr/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/it/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/hr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/es/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/es_419/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Defaulttasks
Translation: Habitica/Gear
Translation: Habitica/Tasks
 2022-05-17 16:35:38 +02:00
SabreCat 9c24d43a13 Merge branch 'develop' into sabrecat/teams-rebase 2022-05-17 09:34:51 -05:00
SabreCat c0e22377d1 Merge branch 'release' into develop 2022-05-17 09:33:45 -05:00
SabreCat 5a13231027 4.230.2 v4.230.2 2022-05-17 09:33:34 -05:00
Natalie L 4e78d72cee May 2022 Magic Hatching Potions and Quest Bundle (#13979) 
* May 2022 magic hatching potions and quest bundle

* fix(string): typo

* fix(content): add and use event

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-17 09:32:50 -05:00
SabreCat 980e35880f fix(login): sanitize redirect 2022-05-16 15:36:09 -05:00
Megan Searles 5bc544c481 for locking items in market, special overrides available set. fixes #13798 (#13817) 
* for locking items, special overrides available

* fix(market): allow purchase of broken item

Co-authored-by: Megan Shepherd <meg.d.shep@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-13 16:11:49 -05:00