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

2426 Commits

Author SHA1 Message Date
Tom Thorpe c00a1d74f9 Allow group links on challenge details to be opened in a new tab (#11889) 
* - Use `router-link` in `groupLink` to make links that can be followed in a new tab

* - Add back the missing `if` statement that was removed in error
 2020-02-29 18:46:41 +01:00
Sabe Jones cbcfb21deb chore(sprites): compile 2020-02-28 15:27:22 -06:00
Sabe Jones 07d6969764 Merge branch 'develop' into release 2020-02-27 15:00:46 -06:00
agentx999 bad148148c Enchanted Armoire immediately updates XP stat in header (fixes #11827) (#11884) 
* sync user if Armoire gives XP

* user can level up from Armoire

* remove XP amount from Armoire XP notification
 2020-02-24 22:19:48 +01:00
Sabe Jones e502588abc Improve G1G1 process (#11792) 
* WIP(g1g1): notif

* WIP(g1g1): notif cont'd

* WIP(gifting): partial modal implementation

* feat(gifting): select giftee modal

* fix(gifting): notification order, modal dismiss

* fix(modals): correct some repops

* fix(gifting): style updates

* fix(modals): new dismiss logic

* fix(modals): new dismiss no go??

* refactor(close): catch up with dismiss functionality

* refactor(g1g1): optimizations
 2020-02-24 16:54:56 +01:00
Matteo Pagliazzi 5718d8396d build(deps): bump svg-inline-loader in /website/client (#11891) 
Bumps [svg-inline-loader](https://github.com/sairion/svg-inline-loader) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/sairion/svg-inline-loader/releases)
- [Changelog](https://github.com/webpack-contrib/svg-inline-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sairion/svg-inline-loader/compare/v0.8.0...v0.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 14:29:55 +01:00
dependabot-preview[bot] b59a63ecbe build(deps): bump bootstrap-vue from 2.4.2 to 2.5.0 in /website/client (#11893) 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.4.2 to 2.5.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.4.2...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 14:29:39 +01:00
dependabot-preview[bot] f0465aab5e build(deps): bump inspectpack from 4.3.1 to 4.4.0 in /website/client (#11892) 
Bumps [inspectpack](https://github.com/FormidableLabs/inspectpack) from 4.3.1 to 4.4.0.
- [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.1...v4.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 14:29:29 +01:00
dependabot-preview[bot] 39ee78127c build(deps): bump eslint-plugin-vue in /website/client (#11894) 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.2.0...v6.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 14:29:04 +01:00
dependabot-preview[bot] 23fc969432 build(deps): bump svg-inline-loader in /website/client 
Bumps [svg-inline-loader](https://github.com/sairion/svg-inline-loader) from 0.8.0 to 0.8.2.
- [Release notes](https://github.com/sairion/svg-inline-loader/releases)
- [Changelog](https://github.com/webpack-contrib/svg-inline-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sairion/svg-inline-loader/compare/v0.8.0...v0.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-24 08:08:33 +00:00
Sabe Jones 5db606dcfd fix(event): end Valentine's NPCs 2020-02-20 14:26:25 -06:00
Phillip Thelen 0b57c0a22d Unify behaviour for shops (#11829) 
* Change price for basilist and dustbunnies

* return correct unlockCondition for moon quests

* Fix basilist not being buyable
 2020-02-20 13:24:43 -06:00
Sabe Jones 5e31278d2a chore(news): Bailey 2020-02-20 11:57:56 -06:00
Sabe Jones f413073d35 Merge branch 'release' into develop 2020-02-18 14:15:21 -06:00
Matteo Pagliazzi 27b9ffb3f2 fix lint in challengeModal 2020-02-18 17:26:14 +01:00
Alejandro Aristizábal 79597cc72b Challenge exception-handling / clientside prize validation (#11769) 
* fix: added client-side validation for challenge prizes

This commit aims to solve the issue #11765 by adding client-side 
validation for the challenge prize. This way, a user is unable to create 
a challenge if the prize is higher than what they can afford. Also, the 
loading property is reset to false after fetching the challenge, however 
this won't work if the request isn't successful.

* style: make validation conditional clearer

* fix: add exception handling when doing server requests.

This commit adds a basic try/catch block for handling server-side 
errors, and successfully enables the submit button if something failed. 
This may also fix #11545, in which a server-side error, difficult to 
valide from the client, was causing the submit button to stay disabled 
until reload.

* fix: reenable prize validation

* fix: bad indentation

* fix: Enable submit button on input change

* fix: add throttling to enableSubmit event.

* fix: reenable prize client-side validation.
 2020-02-18 17:06:42 +01:00
Tutti Quintella 353009821f [Fix #11824] Show member Display Name if Username is blank (#11826) 
* #11824 memberSearchDropdown: use member.profile.name if username is blank

* membwer.auth.local object could be empty
 2020-02-18 17:00:30 +01:00
Sabe Jones 69179c61b1 feat(content): Cotton Candy Pink Prizes 2020-02-17 11:37:37 -06:00
artur-borys c6f6722af7 Fix menu not closing after clicking on menu item (#11866) 2020-02-17 16:37:13 +01:00
Arun Sojan Parolikkal b362b36e16 fix for three dots menu getting covered up by footer issue: #11227 (#11857) 2020-02-17 15:56:33 +01:00
Matteo Pagliazzi f40bb9e91d Merge pull request #11798 from tthorpe88/11768 
Show "no owner" when challenge leader cannot be found fixes #11768
 2020-02-17 15:52:24 +01:00
Matteo Pagliazzi bba068efd5 Merge pull request #11867 from artur-borys/drawer-remove-extra-padding 
Remove drawer padding adjustment, fixes #11863
 2020-02-17 15:27:20 +01:00
Matteo Pagliazzi c89b20ce42 Merge pull request #11856 from neepsnikeep/neepsnikeep/issue_11790_inconsistent_user_count 
Update user count and write text consistently. fixes #11790
 2020-02-17 15:01:01 +01:00
Matteo Pagliazzi 1d72b0e4a2 Merge pull request #11880 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-knobs-5.3.13 
build(deps): bump @storybook/addon-knobs from 5.3.12 to 5.3.13 in /website/client
 2020-02-17 14:36:04 +01:00
dependabot-preview[bot] 05093c5552 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.12 to 5.3.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.13/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 13:27:54 +00:00
dependabot-preview[bot] ee733c644d 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.12 to 5.3.13.
- [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.13/addons/knobs)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 13:27:51 +00:00
Matteo Pagliazzi cb861d266d Merge pull request #11881 from HabitRPG/dependabot/npm_and_yarn/website/client/bootstrap-vue-2.4.2 
build(deps): bump bootstrap-vue from 2.4.0 to 2.4.2 in /website/client
 2020-02-17 13:06:56 +01:00
Matteo Pagliazzi c7b0269fda Merge pull request #11877 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/vue-5.3.13 
build(deps): bump @storybook/vue from 5.3.12 to 5.3.13 in /website/client
 2020-02-17 13:06:48 +01:00
Matteo Pagliazzi bd5ef97f22 build(deps): bump @storybook/addon-actions in /website/client (#11879) 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.12 to 5.3.13.
- [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.13/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 13:06:11 +01:00
dependabot-preview[bot] 2e76d06f5e build(deps): bump eslint-plugin-vue in /website/client (#11878) 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.1.2 to 6.2.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.1.2...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 13:05:56 +01:00
dependabot-preview[bot] b5353717c8 build(deps): bump @storybook/addon-links in /website/client (#11876) 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 5.3.12 to 5.3.13.
- [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.13/addons/links)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 13:05:46 +01:00
dependabot-preview[bot] 52545018b6 build(deps): bump webpack from 4.41.5 to 4.41.6 in /website/client (#11874) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.41.5 to 4.41.6.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.5...v4.41.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 13:02:35 +01:00
dependabot-preview[bot] 107d633d37 build(deps): bump bootstrap-vue from 2.4.0 to 2.4.2 in /website/client 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.4.0 to 2.4.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.4.0...v2.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 08:16:13 +00:00
dependabot-preview[bot] 4f41a8c519 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.12 to 5.3.13.
- [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.13/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 08:14:05 +00:00
dependabot-preview[bot] 72f0e7ffae build(deps): bump @storybook/vue in /website/client 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.12 to 5.3.13.
- [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.13/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-17 08:11:41 +00:00
Artur Boryś 30e5fad6b7 Remove drawer padding adjustment 
Removed method adjusting page padding that assured that the
drawer didn't overlap any conent.
It's unneccesary now, because of footer.
 2020-02-15 14:24:11 +01:00
Sabe Jones 9a6f8021e3 Subscription Page Overhaul (#11823) 
* WIP(settings): subscriber page improvements

* WIP(subscriptions): more design build-out

* fix(css): disabled button styles

* fix(css): better Amazon targeting

* WIP(g1g1): notif

* WIP(g1g1): notif cont'd

* WIP(gifting): partial modal implementation

* feat(gifting): select giftee modal

* fix(gifting): notification order, modal dismiss

* fix(modals): correct some repops

* fix(gifting): style updates

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

* refactor(modals): hide in dismiss event

* fix(modals): new dismiss logic

* fix(modals): new dismiss no go??

* WIP(subscription): unsubscribed state

* WIP(subscription): partial subscribed

* WIP(subscription): finish subscribed

* feat(subscription): revised sub page RC

* fix(subs): style tweaks

* fix(subs): moar style tweaks
 2020-02-13 13:12:45 -06:00
Sabe Jones 142d7e4348 chore(sprites): compile 2020-02-12 14:16:18 -06:00
Katha 181552c8d1 Update user count, it's currently 4,671,530 according to Alys. So the million count goes up to 4 and the texts mentioning the number of users is supposed to display this count. There have been two texts and the count is only in one of them with the other hardcoded. Seems like a good thing to not actually calculate the number of users for performance reasons. resolves #11790 2020-02-12 17:59:32 +01:00
Sabe Jones 107444043e Merge branch 'release' into develop 2020-02-11 14:33:25 -06:00
Sabe Jones 8edd2cfd14 Merge branch 'sabrecat/valentines-2020' into release 2020-02-11 14:30:27 -06:00
Sabe Jones 897b192852 fix(profiles): short circuit contributor 
Attempted fix for #11830
 2020-02-11 14:30:19 -06:00
dependabot-preview[bot] 732426c176 build(deps): bump @vue/cli-plugin-babel in /website/client (#11851) 
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 4.1.2 to 4.2.2.
- [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.2.2/packages/@vue/cli-plugin-babel)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:34:59 +01:00
dependabot-preview[bot] 4df8022811 build(deps): bump @vue/cli-service in /website/client (#11850) 
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 4.1.2 to 4.2.2.
- [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.2.2/packages/@vue/cli-service)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:32:13 +01:00
dependabot-preview[bot] b153c6d054 build(deps): bump @vue/cli-plugin-router in /website/client (#11836) 
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router) from 4.1.2 to 4.2.2.
- [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.2.2/packages/@vue/cli-plugin-router)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:32:03 +01:00
dependabot-preview[bot] c0e1a31937 build(deps): bump @storybook/addon-notes in /website/client (#11841) 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.10 to 5.3.12.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.12/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.12/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:30:46 +01:00
dependabot-preview[bot] ac29d662ef build(deps): bump @storybook/addon-links in /website/client (#11846) 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 5.3.10 to 5.3.12.
- [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.12/addons/links)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:27:25 +01:00
dependabot-preview[bot] 247246b99d build(deps): bump @storybook/addon-actions in /website/client (#11837) 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.10 to 5.3.12.
- [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.12/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:27:14 +01:00
dependabot-preview[bot] 13fa1924ae build(deps): bump amplitude-js from 5.8.0 to 5.9.0 in /website/client (#11838) 
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 5.8.0 to 5.9.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/compare/v5.8.0...v5.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:25:56 +01:00
dependabot-preview[bot] d55400cc80 build(deps): bump @vue/cli-plugin-eslint in /website/client (#11839) 
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.1.2 to 4.2.2.
- [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.2.2/packages/@vue/cli-plugin-eslint)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 17:25:44 +01:00