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

2349 Commits

Author SHA1 Message Date
Sabe Jones 6a2e84e7cc fix(sprites): new spritesheet 2020-02-05 05:31:20 -06:00
Sabe Jones 37ab993b01 chore(sprites): compile 2020-02-04 15:42:23 -06:00
Nik 57b2166bde NPC style should apply to tier $800 only (#11797) 
- Fix wrong level field
- Check if tier is 800 everywhere
 2020-02-02 11:59:43 +01:00
Sabe Jones 64c79b7eb6 chore(sprites): compile 2020-02-01 07:26:40 -06:00
Sabe Jones e800cd9a3f chore(event): End Wonderland 2020-02-01 07:20:55 -06:00
Sabe Jones d77b791d56 fix(sprites): rename February items 2020-02-01 06:21:47 -06:00
Sabe Jones 728eaecfc8 Merge branch 'develop' into release 2020-01-31 06:47:26 -06:00
Sabe Jones 505509d4b7 chore(sprites): compile 2020-01-31 06:47:06 -06:00
Matteo Pagliazzi c772afd0c8 Merge pull request #11647 from tsukimi2/bugfix-npc-style 
Fix issues in NPCs should have NPC style on Display Name in chat, Hall. (fixes #11617)
 2020-01-29 15:41:46 +01:00
Sabe Jones bc1eb62a35 feat(event): Birthday 2020 2020-01-28 15:39:05 -06:00
Matteo Pagliazzi 02d6b77a03 Merge pull request #11783 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-notes-5.3.9 
build(deps): bump @storybook/addon-notes from 5.3.7 to 5.3.9 in /website/client
 2020-01-27 10:33:10 +01:00
dependabot-preview[bot] 8e37d35fda 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.7 to 5.3.9.
- [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.9/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 09:31:30 +00:00
dependabot-preview[bot] 384312b089 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.7 to 5.3.9.
- [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.9/addons/knobs)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 09:31:20 +00:00
Matteo Pagliazzi cb175008dd Merge pull request #11780 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-links-5.3.9 
build(deps): bump @storybook/addon-links from 5.3.7 to 5.3.9 in /website/client
 2020-01-27 10:27:22 +01:00
Matteo Pagliazzi a5c0d50ade Merge pull request #11784 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/vue-5.3.9 
build(deps): bump @storybook/vue from 5.3.7 to 5.3.9 in /website/client
 2020-01-27 10:27:09 +01:00
Matteo Pagliazzi 6064bc0103 Merge pull request #11782 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-actions-5.3.9 
build(deps): bump @storybook/addon-actions from 5.3.7 to 5.3.9 in /website/client
 2020-01-27 10:26:42 +01:00
Matteo Pagliazzi cf7fd60fff Merge pull request #11786 from HabitRPG/dependabot/npm_and_yarn/website/client/bootstrap-vue-2.3.0 
build(deps): bump bootstrap-vue from 2.2.2 to 2.3.0 in /website/client
 2020-01-27 10:26:27 +01:00
Matteo Pagliazzi dd8d84bff1 Merge pull request #11785 from HabitRPG/dependabot/npm_and_yarn/website/client/axios-0.19.2 
build(deps): bump axios from 0.19.1 to 0.19.2 in /website/client
 2020-01-27 10:25:37 +01:00
dependabot-preview[bot] 4c3efdebfa build(deps): bump inspectpack from 4.3.0 to 4.3.1 in /website/client 
Bumps [inspectpack](https://github.com/FormidableLabs/inspectpack) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/FormidableLabs/inspectpack/releases)
- [Changelog](https://github.com/FormidableLabs/inspectpack/blob/master/HISTORY.md)
- [Commits](https://github.com/FormidableLabs/inspectpack/compare/v4.3.0...v4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 08:10:30 +00:00
dependabot-preview[bot] 2aba6acc47 build(deps): bump bootstrap-vue from 2.2.2 to 2.3.0 in /website/client 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.2.2 to 2.3.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.2.2...v2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 08:09:27 +00:00
dependabot-preview[bot] 10718def11 build(deps): bump axios from 0.19.1 to 0.19.2 in /website/client 
Bumps [axios](https://github.com/axios/axios) from 0.19.1 to 0.19.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/0.19.1...v0.19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 08:08:34 +00:00
dependabot-preview[bot] df8e3e5b64 build(deps): bump @storybook/vue from 5.3.7 to 5.3.9 in /website/client 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.7 to 5.3.9.
- [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.9/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 08:07:58 +00:00
dependabot-preview[bot] 61e23c5157 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.7 to 5.3.9.
- [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.9/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 08:06:06 +00:00
dependabot-preview[bot] b77de58f71 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.7 to 5.3.9.
- [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.9/addons/links)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 08:04:09 +00:00
Sabe Jones aefd664db1 Correct some modal repops (#11739) 
* fix(modals): correct some repops

* fix(modals): also clean out "prev"

* refactor(modals): hide in dismiss event
 2020-01-24 16:36:11 -06:00
Sabe Jones cbac69ab11 chore(news): Bailey 2020-01-23 15:47:53 -06:00
Sabe Jones d2156eb97b Merge branch 'release' into develop 2020-01-22 05:47:34 -06:00
Sabe Jones 0be5b5c9c7 fix(timetrav): no sub but hourglass 2020-01-22 05:46:12 -06:00
Sabe Jones 1f16891b15 Merge branch 'release' into develop 2020-01-21 15:47:39 -06:00
Sabe Jones c2c5c8a86d chore(sprites): compile 2020-01-21 15:47:08 -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
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
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
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 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 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 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
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