Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,039 Commits 64 Branches 1,256 Tags
2c0da084eaede3b08181cd2bcefc2eb39d68fc55
Commit Graph

20039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi 92d19eff80 Merge pull request #11491 from HabitRPG/dependabot/npm_and_yarn/aws-sdk-2.556.0 
build(deps): bump aws-sdk from 2.555.0 to 2.556.0
 2019-10-28 11:48:59 +01:00
dependabot-preview[bot] 9c6a0e047c build(deps): bump aws-sdk from 2.555.0 to 2.556.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.555.0 to 2.556.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.555.0...v2.556.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 07:56:49 +00:00
dependabot-preview[bot] 33d7391202 build(deps-dev): bump eslint-config-habitrpg from 6.1.0 to 6.2.0 
Bumps [eslint-config-habitrpg](https://github.com/HabitRPG/eslint-config) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/HabitRPG/eslint-config/releases)
- [Commits](https://github.com/HabitRPG/eslint-config/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 07:54:26 +00:00
dependabot-preview[bot] 43acb6da95 build(deps): bump core-js from 3.3.3 to 3.3.4 in /website/client 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.3.3 to 3.3.4.
- [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.3.3...v3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 07:53:48 +00:00
dependabot-preview[bot] 4870623869 build(deps): bump mongoose from 5.7.6 to 5.7.7 
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.7.6 to 5.7.7.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.7.6...5.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 07:52:56 +00:00
dependabot-preview[bot] ee7e40b5c8 build(deps): bump eslint-config-habitrpg in /website/client 
Bumps [eslint-config-habitrpg](https://github.com/HabitRPG/eslint-config) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/HabitRPG/eslint-config/releases)
- [Commits](https://github.com/HabitRPG/eslint-config/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 07:52:33 +00:00
Matteo Pagliazzi a3b1e2b524 Merge pull request #11465 from HabitRPG/dependabot/npm_and_yarn/website/client/vue/cli-plugin-router-4.0.5 
Bump @vue/cli-plugin-router from 4.0.4 to 4.0.5 in /website/client
 2019-10-27 17:33:21 +01:00
Matteo Pagliazzi 0a4bff0587 Merge pull request #11469 from HabitRPG/dependabot/npm_and_yarn/website/client/vue/cli-service-4.0.5 
Bump @vue/cli-service from 4.0.4 to 4.0.5 in /website/client
 2019-10-27 17:33:13 +01:00
dependabot-preview[bot] 936fa28a25 Bump @vue/cli-service from 4.0.4 to 4.0.5 in /website/client 
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 4.0.4 to 4.0.5.
- [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.0.5/packages/@vue/cli-service)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-27 16:32:58 +00:00
dependabot-preview[bot] c3cff31edf Bump @vue/cli-plugin-router from 4.0.4 to 4.0.5 in /website/client 
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router) from 4.0.4 to 4.0.5.
- [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.0.5/packages/@vue/cli-plugin-router)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-27 16:32:45 +00:00
Matteo Pagliazzi 8f0a9e978d Merge pull request #11462 from HabitRPG/dependabot/npm_and_yarn/website/client/vue/cli-plugin-babel-4.0.5 
Bump @vue/cli-plugin-babel from 4.0.4 to 4.0.5 in /website/client
 2019-10-27 17:30:53 +01:00
dependabot-preview[bot] 81be2f0c28 Bump @vue/cli-plugin-babel from 4.0.4 to 4.0.5 in /website/client 
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 4.0.4 to 4.0.5.
- [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.0.5/packages/@vue/cli-plugin-babel)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-27 16:30:41 +00:00
Matteo Pagliazzi 31a5b420d9 Merge pull request #11467 from HabitRPG/dependabot/npm_and_yarn/website/client/amplitude-js-5.6.0 
Bump amplitude-js from 5.5.0 to 5.6.0 in /website/client
 2019-10-27 17:30:02 +01:00
Matteo Pagliazzi d206c39b8d Merge pull request #11476 from HabitRPG/dependabot/npm_and_yarn/aws-sdk-2.555.0 
build(deps): bump aws-sdk from 2.553.0 to 2.555.0
 2019-10-27 17:29:44 +01:00
Matteo Pagliazzi ba063ec74e Merge pull request #11468 from HabitRPG/dependabot/npm_and_yarn/mongoose-5.7.6 
Bump mongoose from 5.7.5 to 5.7.6
 2019-10-27 17:29:35 +01:00
Matteo Pagliazzi f84cdfa3cf Merge pull request #11464 from HabitRPG/dependabot/npm_and_yarn/glob-7.1.5 
Bump glob from 7.1.4 to 7.1.5
 2019-10-27 17:29:14 +01:00
Matteo Pagliazzi 9149588025 Merge pull request #11463 from HabitRPG/dependabot/npm_and_yarn/website/client/vue/cli-plugin-unit-mocha-4.0.5 
Bump @vue/cli-plugin-unit-mocha from 4.0.4 to 4.0.5 in /website/client
 2019-10-27 17:29:07 +01:00
Matteo Pagliazzi 61427e7bfc Merge pull request #11470 from HabitRPG/dependabot/npm_and_yarn/helmet-3.21.2 
Bump helmet from 3.21.1 to 3.21.2
 2019-10-27 17:28:50 +01:00
Matteo Pagliazzi bcbcd29da7 Merge pull request #11471 from HabitRPG/dependabot/npm_and_yarn/website/client/vue/cli-plugin-eslint-4.0.5 
Bump @vue/cli-plugin-eslint from 4.0.4 to 4.0.5 in /website/client
 2019-10-27 17:28:42 +01:00
Matteo Pagliazzi 1c851af612 Bump core-js from 3.3.2 to 3.3.3 in /website/client (#11472) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.3.2 to 3.3.3.
- [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.3.2...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-27 17:28:33 +01:00
dependabot-preview[bot] 3c4bbd673c Bump sass from 1.23.0 to 1.23.1 in /website/client (#11473) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.23.0...1.23.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-27 17:28:25 +01:00
Matteo Pagliazzi 3643b4d320 fix linting in production 2019-10-27 14:12:14 +01:00
Matteo Pagliazzi 57b9dc374a Intro.js Fixes and better client side logging (#11480) 
* fix intro.js button and border for username modal

* fix unhandled error and add better logging
 2019-10-27 13:11:40 +01:00
Matteo Pagliazzi 5dc5b4ac92 remove vagrant files (#11452) 2019-10-26 14:05:36 +02:00
Melior f7e2f04da6 Merge branch 'origin/develop' into Weblate. 2019-10-24 22:52:35 +02:00
Melior 47e4ee222d Translated using Weblate (Vietnamese) 
Currently translated at 25.0% (9 of 36 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/vi/

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (63 of 63 strings)

Translation: Habitica/Defaulttasks
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/vi/

Translated using Weblate (Dutch)

Currently translated at 100.0% (36 of 36 strings)

Translation: Habitica/Loadingscreentips
Translate-URL: https://translate.habitica.com/projects/habitica/loadingscreentips/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (28 of 28 strings)

Translation: Habitica/Rebirth
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/nl/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (171 of 171 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt_BR/

Translated using Weblate (Polish)

Currently translated at 100.0% (171 of 171 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pl/

Translated using Weblate (Dutch)

Currently translated at 97.0% (166 of 171 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/nl/

Translated using Weblate (Japanese)

Currently translated at 100.0% (171 of 171 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/

Translated using Weblate (French)

Currently translated at 100.0% (171 of 171 strings)

Translation: Habitica/Npc
Translate-URL: https://translate.habitica.com/projects/habitica/npc/fr/

Translated using Weblate (Dutch)

Currently translated at 100.0% (12 of 12 strings)

Translation: Habitica/Merch
Translate-URL: https://translate.habitica.com/projects/habitica/merch/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (31 of 31 strings)

Translation: Habitica/Maintenance
Translate-URL: https://translate.habitica.com/projects/habitica/maintenance/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (27 of 27 strings)

Translation: Habitica/Loginincentives
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/nl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (6 of 6 strings)

Translation: Habitica/Inventory
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/nl/

Translated using Weblate (French)

Currently translated at 100.0% (1961 of 1961 strings)

Translation: Habitica/Gear
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/

Translated using Weblate (French)

Currently translated at 100.0% (296 of 296 strings)

Translation: Habitica/Generic
Translate-URL: https://translate.habitica.com/projects/habitica/generic/fr/

Translated using Weblate (Polish)

Currently translated at 100.0% (353 of 353 strings)

Translation: Habitica/Content
Translate-URL: https://translate.habitica.com/projects/habitica/content/pl/

Translated using Weblate (Dutch)

Currently translated at 100.0% (70 of 70 strings)

Translation: Habitica/Contrib
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/nl/

Translated using Weblate (Japanese)

Currently translated at 100.0% (230 of 230 strings)

Translation: Habitica/Character
Translate-URL: https://translate.habitica.com/projects/habitica/character/ja/

Translated using Weblate (Polish)

Currently translated at 100.0% (473 of 473 strings)

Translation: Habitica/Backgrounds
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pl/

Translated using Weblate (Russian)

Currently translated at 94.4% (34 of 36 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ru/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (36 of 36 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/

Translated using Weblate (Dutch)

Currently translated at 100.0% (36 of 36 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/nl/

Translated using Weblate (French)

Currently translated at 100.0% (36 of 36 strings)

Translation: Habitica/Achievements
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (211 of 211 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/pt_BR/

Translated using Weblate (Polish)

Currently translated at 100.0% (211 of 211 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/pl/

Translated using Weblate (French)

Currently translated at 100.0% (211 of 211 strings)

Translation: Habitica/Settings
Translate-URL: https://translate.habitica.com/projects/habitica/settings/fr/
 2019-10-24 22:52:08 +02:00
Sabe Jones 9a4e6a5012 Merge branch 'release' into develop 2019-10-24 15:49:55 -05:00
Sabe Jones 1859f43133 4.118.0 v4.118.0 2019-10-24 15:36:41 -05:00
Sabe Jones 2bcf00fb54 feat(content): Mystery Items 2019-10 2019-10-24 15:36:32 -05:00
Matteo Pagliazzi 78946bf328 fix(client scripts): add output and fix linting 2019-10-24 14:29:47 +02:00
Matteo Pagliazzi cab6b35e49 Merge branch 'develop' of github.com:HabitRPG/habitica into develop 2019-10-24 14:07:40 +02:00
Matteo Pagliazzi 04b18641ff fix windows postinstall 2019-10-24 14:06:20 +02:00
Alys bd121d4286 add swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2019-10-24 20:49:29 +10:00
Matteo Pagliazzi c3a8305a40 Mentions Fix and Test (#11475) 
* Fix issue with mentioned members not being loaded enough

* mentions: add integration tests and fix saved message
 2019-10-24 11:35:15 +02:00
dependabot-preview[bot] b0349d7297 build(deps): bump aws-sdk from 2.553.0 to 2.555.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.553.0 to 2.555.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.553.0...v2.555.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:28:40 +00:00
dependabot-preview[bot] e83ac52f17 Bump mongoose from 5.7.5 to 5.7.6 
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.7.5...5.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:28:37 +00:00
dependabot-preview[bot] 2aa9a65765 Bump amplitude-js from 5.5.0 to 5.6.0 in /website/client 
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 5.5.0 to 5.6.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases)
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/amplitude/amplitude-javascript/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:28:29 +00:00
dependabot-preview[bot] 9bdeb33f4c Bump glob from 7.1.4 to 7.1.5 
Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.4 to 7.1.5.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.4...v7.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:28:22 +00:00
dependabot-preview[bot] dd691a84e6 Bump @vue/cli-plugin-unit-mocha from 4.0.4 to 4.0.5 in /website/client 
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha) from 4.0.4 to 4.0.5.
- [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.0.5/packages/@vue/cli-plugin-unit-mocha)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:28:11 +00:00
dependabot-preview[bot] cac5e0a10c Bump helmet from 3.21.1 to 3.21.2 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.21.1 to 3.21.2.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.21.1...v3.21.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:27:42 +00:00
dependabot-preview[bot] ff7b6c592e Bump @vue/cli-plugin-eslint from 4.0.4 to 4.0.5 in /website/client 
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.0.4 to 4.0.5.
- [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.0.5/packages/@vue/cli-plugin-eslint)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:27:36 +00:00
dependabot-preview[bot] 1a0e266ebb Bump core-js from 3.3.2 to 3.3.3 in /website/client 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.3.2 to 3.3.3.
- [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.3.2...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-24 09:27:14 +00:00
Sabe Jones b121585c68 fix(intro): don't use svg for background 2019-10-23 12:48:51 -05:00
Sabe Jones 51726d8d8e fix(pets): correct achievement logic 2019-10-23 08:21:51 -05:00
Sabe Jones 2b8e25833d fix(schema): add missing notif types 2019-10-23 08:10:43 -05:00
Matteo Pagliazzi 1d7ec89b47 Merge branch 'develop' of github.com:HabitRPG/habitica into develop 2019-10-22 20:38:16 +02:00
Matteo Pagliazzi 9afcf8d5eb fix(build): do not lint when testing on github 2019-10-22 20:38:01 +02:00
Sabe Jones 93393f4835 fix(lint): more issues caught in CI 2019-10-22 13:37:28 -05:00
Sabe Jones 3031caffe8 fix(tests): bad merge, linting 2019-10-22 12:53:00 -05:00
Melior 1492994fa8 Merge branch 'origin/develop' into Weblate. 2019-10-22 17:43:01 +02:00