Sabe Jones
|
1f16891b15
|
Merge branch 'release' into develop
|
2020-01-21 15:47:39 -06:00 |
|
Sabe Jones
|
fcebd4327d
|
4.130.0
|
2020-01-21 15:47:15 -06:00 |
|
Sabe Jones
|
c2c5c8a86d
|
chore(sprites): compile
|
2020-01-21 15:47:08 -06:00 |
|
Sabe Jones
|
8bdd56587e
|
chore(timetrav): Bailey
|
2020-01-21 15:41:16 -06:00 |
|
Sabe Jones
|
64e6e6c27a
|
fix(timetrav): quest currency color, modal refix
|
2020-01-21 15:16:09 -06:00 |
|
Sabe Jones
|
356302674c
|
fix(buy): modal style changes
|
2020-01-21 15:03:29 -06:00 |
|
Sabe Jones
|
ee9eb3f78a
|
Merge branch 'release' into sabrecat/timetrav-bgs
|
2020-01-21 14:58:51 -06:00 |
|
osiris
|
eb21d27fa2
|
Make changes to correct problems from merging as requested.
|
2020-01-21 12:40:16 +08:00 |
|
osiris
|
5efde3159f
|
Merge remote-tracking branch 'upstream/develop' into bugfix-npc-style
Updating bugfix-npc-style with recent code from upstream/develop branch.
|
2020-01-21 11:04:32 +08:00 |
|
Kevin-DDR
|
b6407be529
|
Merge branch 'fixTiers' of https://github.com/Kevin-DDR/habitica into fixTiers
|
2020-01-20 20:32:07 +01:00 |
|
Kevin-DDR
|
3477dcd226
|
Added contributor tier color/icon in guild and challenge member list
|
2020-01-20 20:29:52 +01:00 |
|
Kevin-DDR
|
b41ad76c9e
|
Added contributor tier color/icon in guild and challenge member list
|
2020-01-20 20:23:04 +01:00 |
|
Matteo Pagliazzi
|
c264465534
|
Merge pull request #11750 from HabitRPG/dependabot/npm_and_yarn/babel/preset-env-7.8.3
build(deps): bump @babel/preset-env from 7.8.2 to 7.8.3
|
2020-01-20 11:21:46 +01:00 |
|
dependabot-preview[bot]
|
7d5dc63efc
|
build(deps): bump @babel/preset-env from 7.8.2 to 7.8.3
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.2 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.2...v7.8.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 10:21:30 +00:00 |
|
Matteo Pagliazzi
|
0d31ceea83
|
Merge pull request #11757 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-notes-5.3.7
build(deps): bump @storybook/addon-notes from 5.3.1 to 5.3.7 in /website/client
|
2020-01-20 11:21:23 +01:00 |
|
Matteo Pagliazzi
|
da5c835ec0
|
Merge pull request #11760 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-actions-5.3.7
build(deps): bump @storybook/addon-actions from 5.3.1 to 5.3.7 in /website/client
|
2020-01-20 11:21:05 +01:00 |
|
dependabot-preview[bot]
|
e753068aee
|
build(deps): bump @storybook/addon-actions in /website/client
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.1 to 5.3.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.7/addons/actions)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 10:20:45 +00:00 |
|
dependabot-preview[bot]
|
9f20b5c2a8
|
build(deps): bump @storybook/addon-notes in /website/client
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.1 to 5.3.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.7/addons/notes)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 10:20:37 +00:00 |
|
Matteo Pagliazzi
|
18a32e8496
|
Merge pull request #11747 from HabitRPG/dependabot/npm_and_yarn/website/client/sass-loader-8.0.2
build(deps): bump sass-loader from 8.0.1 to 8.0.2 in /website/client
|
2020-01-20 11:18:31 +01:00 |
|
Matteo Pagliazzi
|
f04c88c60f
|
Merge pull request #11751 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-knobs-5.3.7
build(deps): bump @storybook/addon-knobs from 5.3.1 to 5.3.7 in /website/client
|
2020-01-20 11:18:23 +01:00 |
|
dependabot-preview[bot]
|
8f4e20a414
|
build(deps): bump sass-loader from 8.0.1 to 8.0.2 in /website/client
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 8.0.1 to 8.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.1...v8.0.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 10:18:17 +00:00 |
|
Matteo Pagliazzi
|
45ea77b743
|
Merge pull request #11752 from HabitRPG/dependabot/npm_and_yarn/babel/register-7.8.3
build(deps): bump @babel/register from 7.8.0 to 7.8.3
|
2020-01-20 11:18:13 +01:00 |
|
dependabot-preview[bot]
|
83b722456c
|
build(deps): bump @storybook/addon-knobs in /website/client
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs) from 5.3.1 to 5.3.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.7/addons/knobs)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 10:18:04 +00:00 |
|
Matteo Pagliazzi
|
ca7be4c0a4
|
Merge pull request #11743 from HabitRPG/dependabot/npm_and_yarn/mongoose-5.8.9
build(deps): bump mongoose from 5.8.7 to 5.8.9
|
2020-01-20 11:17:58 +01:00 |
|
Matteo Pagliazzi
|
5345b66c8d
|
Merge pull request #11746 from HabitRPG/dependabot/npm_and_yarn/aws-sdk-2.606.0
build(deps): bump aws-sdk from 2.601.0 to 2.606.0
|
2020-01-20 11:17:31 +01:00 |
|
Matteo Pagliazzi
|
2188bee7cb
|
Merge pull request #11749 from HabitRPG/dependabot/npm_and_yarn/website/client/core-js-3.6.4
build(deps): bump core-js from 3.6.3 to 3.6.4 in /website/client
|
2020-01-20 11:17:20 +01:00 |
|
Matteo Pagliazzi
|
df43ea863c
|
Merge pull request #11756 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/vue-5.3.7
build(deps): bump @storybook/vue from 5.3.1 to 5.3.7 in /website/client
|
2020-01-20 11:17:04 +01:00 |
|
Matteo Pagliazzi
|
78d2299aaa
|
Merge pull request #11745 from HabitRPG/dependabot/npm_and_yarn/babel/core-7.8.3
build(deps): bump @babel/core from 7.8.0 to 7.8.3
|
2020-01-20 11:16:53 +01:00 |
|
Matteo Pagliazzi
|
d67e800863
|
Merge pull request #11753 from HabitRPG/dependabot/npm_and_yarn/website/client/bootstrap-vue-2.2.2
build(deps): bump bootstrap-vue from 2.2.0 to 2.2.2 in /website/client
|
2020-01-20 11:16:41 +01:00 |
|
Matteo Pagliazzi
|
fae18d7631
|
Merge pull request #11754 from HabitRPG/dependabot/npm_and_yarn/uuid-3.4.0
build(deps): bump uuid from 3.3.3 to 3.4.0
|
2020-01-20 11:16:30 +01:00 |
|
Matteo Pagliazzi
|
4ede851d30
|
Merge pull request #11755 from HabitRPG/dependabot/npm_and_yarn/website/client/vue-router-3.1.5
build(deps): bump vue-router from 3.1.3 to 3.1.5 in /website/client
|
2020-01-20 11:16:04 +01:00 |
|
Matteo Pagliazzi
|
6f69721d25
|
Merge pull request #11758 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-links-5.3.7
build(deps): bump @storybook/addon-links from 5.3.1 to 5.3.7 in /website/client
|
2020-01-20 11:15:48 +01:00 |
|
Matteo Pagliazzi
|
2bc4c1324c
|
Merge pull request #11761 from HabitRPG/dependabot/npm_and_yarn/website/client/uuid-3.4.0
build(deps): bump uuid from 3.3.3 to 3.4.0 in /website/client
|
2020-01-20 11:15:32 +01:00 |
|
Matteo Pagliazzi
|
59bca3fd3a
|
Merge pull request #11762 from HabitRPG/dependabot/npm_and_yarn/website/client/sass-1.25.0
build(deps): bump sass from 1.24.4 to 1.25.0 in /website/client
|
2020-01-20 11:15:18 +01:00 |
|
dependabot-preview[bot]
|
d4cfa65f94
|
build(deps): bump sass from 1.24.4 to 1.25.0 in /website/client
Bumps [sass](https://github.com/sass/dart-sass) from 1.24.4 to 1.25.0.
- [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.24.4...1.25.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:12:18 +00:00 |
|
dependabot-preview[bot]
|
caf47a9961
|
build(deps): bump uuid from 3.3.3 to 3.4.0 in /website/client
Bumps [uuid](https://github.com/uuidjs/uuid) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.3.3...v3.4.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:11:25 +00:00 |
|
dependabot-preview[bot]
|
5097f67123
|
build(deps): bump @storybook/addon-links in /website/client
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 5.3.1 to 5.3.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.7/addons/links)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:08:06 +00:00 |
|
dependabot-preview[bot]
|
fc8bba63df
|
build(deps): bump @storybook/vue from 5.3.1 to 5.3.7 in /website/client
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.1 to 5.3.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.7/app/vue)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:05:22 +00:00 |
|
dependabot-preview[bot]
|
71f62232af
|
build(deps): bump vue-router from 3.1.3 to 3.1.5 in /website/client
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.1.3 to 3.1.5.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.1.3...v3.1.5)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:03:30 +00:00 |
|
dependabot-preview[bot]
|
01699229d3
|
build(deps): bump uuid from 3.3.3 to 3.4.0
Bumps [uuid](https://github.com/uuidjs/uuid) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v3.3.3...v3.4.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:01:50 +00:00 |
|
dependabot-preview[bot]
|
c55f611807
|
build(deps): bump bootstrap-vue from 2.2.0 to 2.2.2 in /website/client
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.2.0 to 2.2.2.
- [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.2.0...v2.2.2)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:01:49 +00:00 |
|
dependabot-preview[bot]
|
a369751051
|
build(deps): bump @babel/register from 7.8.0 to 7.8.3
Bumps [@babel/register](https://github.com/babel/babel) from 7.8.0 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.0...v7.8.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 08:00:45 +00:00 |
|
dependabot-preview[bot]
|
56ce56fc3b
|
build(deps): bump core-js from 3.6.3 to 3.6.4 in /website/client
Bumps [core-js](https://github.com/zloirock/core-js) from 3.6.3 to 3.6.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.6.3...v3.6.4)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 07:58:50 +00:00 |
|
dependabot-preview[bot]
|
a59d130c43
|
build(deps): bump aws-sdk from 2.601.0 to 2.606.0
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.601.0 to 2.606.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.601.0...v2.606.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 07:57:19 +00:00 |
|
dependabot-preview[bot]
|
95b0a79289
|
build(deps): bump @babel/core from 7.8.0 to 7.8.3
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.0 to 7.8.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.0...v7.8.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 07:56:21 +00:00 |
|
dependabot-preview[bot]
|
45b41cf6b0
|
build(deps): bump mongoose from 5.8.7 to 5.8.9
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.8.7 to 5.8.9.
- [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.8.7...5.8.9)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-01-20 07:54:18 +00:00 |
|
Matteo Pagliazzi
|
ca69085e8c
|
Merge pull request #11549 from Nikosmonaut/bugfix-11522_group_plan_tags
Fix can not remove group tag
|
2020-01-19 12:29:04 +01:00 |
|
Matteo Pagliazzi
|
b5af9b292e
|
Merge pull request #11741 from HabitRPG/fix/pm-textarea-styling
fix style textarea + added story for an overview
|
2020-01-19 12:22:49 +01:00 |
|
negue
|
4a812a9d28
|
fix style textarea + added story for an overview
|
2020-01-18 17:17:50 +01:00 |
|
Melior
|
383bbc558b
|
Merge branch 'origin/develop' into Weblate.
|
2020-01-16 23:21:01 +01:00 |
|