Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,024 Commits 64 Branches 1,256 Tags
53f19c4da3a1465bdb2f9f19c4e3ffd1f025ea0c
Commit Graph

2953 Commits

Author SHA1 Message Date
Sabe Jones 53f19c4da3 feat(event): Winter Wonderland 2021 and Gift-One-Get-One Promotion 2020-12-10 16:53:37 -06:00
Sabe Jones 25d9102674 Merge branch 'release' into develop 2020-12-08 11:13:25 -06:00
Alys 62498ab646 remove links to Moderator Contact Form 
This is a temporary measure until we can get the form working again.

This has NOT been approved by any of Habitica's staff.
It's just being proposed for consideration.

The changes are:

- remove link from Help menu
- replace link in Contacts page with mailto admin@habitica.com without changing the visible text of the link
- replace link in Tavern sidebar with mailto admin@habitica.com using the visible text from the Contacts page
 2020-12-07 15:48:45 -06:00
Sabe Jones cf435ad007 chore(sprites): compile 2020-12-07 15:40:32 -06:00
dependabot-preview[bot] 4db0002d5d build(deps): bump validator from 13.1.17 to 13.5.1 in /website/client (#12846) 
Bumps [validator](https://github.com/chriso/validator.js) from 13.1.17 to 13.5.1.
- [Release notes](https://github.com/chriso/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chriso/validator.js/compare/13.1.17...13.5.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-12-07 17:14:42 +01:00
dependabot-preview[bot] 3c1d7fce5f build(deps): bump sass from 1.29.0 to 1.30.0 in /website/client (#12851) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.29.0 to 1.30.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.29.0...1.30.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-12-07 17:10:32 +01:00
dependabot-preview[bot] e840661da8 build(deps): bump bootstrap-vue from 2.19.0 to 2.20.1 in /website/client (#12848) 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.19.0 to 2.20.1.
- [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.19.0...v2.20.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-12-07 17:10:06 +01:00
dependabot-preview[bot] ec912a6dda build(deps): bump core-js from 3.8.0 to 3.8.1 in /website/client (#12850) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.8.0 to 3.8.1.
- [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.8.0...v3.8.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-12-07 17:09:44 +01:00
Matteo Pagliazzi 5d6583936d fix(skill casting): pass empty req on client, fixes #12839 2020-12-06 00:01:34 +01:00
Vipul Khandelwal bc181819f4 Fixed Skill Layout (#12776) 
* Fixed Skill Layout

* Fixed skill layout reponsiveness

* Fixed collapsing of drawer container

* Fixed skill card disabled state, extra white border and hover sstate

* Fixed task / member selection style

* Fixed few changes

* Fixed extra padding and box shadow

* Fixed box shadow and added popover component

* Fixed disabled state issue

* Fixed styles and skill card issues

* Fixed style issues

* Fixed style issue

* Fixed lint error

* Fixed space between drawer class

* Fixed border issue

* Fixed round border issue

* Fixed Mage issue

* auto eslint fixes

* use translated string and computed property, reorganize css

* perf: reduce calculated classes, throttle mouse moved event

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
 2020-12-04 22:05:56 +01:00
Sabe Jones 637048af0b Merge branch 'release' into develop 2020-11-30 15:01:07 -06:00
Sabe Jones 2ed15f58e9 chore(sprites): compile 2020-11-30 14:59:36 -06:00
Sabe Jones 42de4397a1 feat(content): December Mystery Items 2020-11-30 14:59:30 -06:00
negue d3eb9fe230 Apply Dropdown Styles to various parts (#12814) 
* membersModal use the new select component instead of html select

* update dropdown styles on challengeDetail (add task) and on inventory unequip

* change the width to "min-width"
 2020-11-30 20:01:22 +01:00
dependabot-preview[bot] 8c953ea8cb build(deps): bump core-js from 3.7.0 to 3.8.0 in /website/client (#12833) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.7.0 to 3.8.0.
- [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.7.0...v3.8.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-30 11:52:58 +01:00
dependabot-preview[bot] f41eae3bf3 build(deps): bump nconf from 0.10.0 to 0.11.0 in /website/client (#12829) 
Bumps [nconf](https://github.com/flatiron/nconf) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/flatiron/nconf/releases)
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flatiron/nconf/compare/0.10.0...v0.11.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-30 11:52:07 +01:00
Sabe Jones f31370d7ba chore(event): NPCs and auto award turkey 2020-11-26 14:01:23 -06:00
Sabe Jones 281d7b4fe2 Merge branch 'release' into develop 2020-11-24 17:57:24 -06:00
Sabe Jones 00f66b3824 chore(sprites): compile 2020-11-24 17:53:23 -06:00
Sabe Jones c4f6644c3a feat(content): Red Pet Achievement 2020-11-24 17:53:15 -06:00
Alys 9b76f9831e Miscellaneous lint fixes: move watch & mounted properties; apply automatic fixes (#12791) 
* commit lint's automatic fixes

* move watch and mounted properties as advised in lint warnings
 2020-11-23 22:14:14 +01:00
dependabot-preview[bot] 670843c395 build(deps): bump @vue/cli-plugin-unit-mocha in /website/client (#12810) 
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha) from 4.5.8 to 4.5.9.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.9/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.9/packages/@vue/cli-plugin-unit-mocha)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-23 11:31:20 +01:00
dependabot-preview[bot] a81e6932fb build(deps): bump @vue/cli-plugin-eslint in /website/client (#12806) 
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.5.8 to 4.5.9.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.9/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.9/packages/@vue/cli-plugin-eslint)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-23 11:31:00 +01:00
dependabot-preview[bot] e499666f64 build(deps): bump @vue/cli-plugin-router in /website/client (#12807) 
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router) from 4.5.8 to 4.5.9.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.9/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.9/packages/@vue/cli-plugin-router)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-23 11:25:34 +01:00
dependabot-preview[bot] b5a25d74df build(deps): bump @vue/cli-plugin-babel in /website/client (#12811) 
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 4.5.8 to 4.5.9.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.9/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.9/packages/@vue/cli-plugin-babel)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-23 11:25:21 +01:00
dependabot-preview[bot] d5408b89b2 build(deps): bump @vue/cli-service in /website/client (#12805) 
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 4.5.8 to 4.5.9.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.9/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.9/packages/@vue/cli-service)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-23 11:24:59 +01:00
Sabe Jones 809398f607 Merge branch 'release' into develop 2020-11-18 13:53:50 -06:00
Sabe Jones a8ac927030 chore(sprites): compile 2020-11-16 15:52:13 -06:00
Matteo Pagliazzi df1e4af7fc fix(profile): correctly change page title when closing profile modal, fixes #12760, thanks @aevix 2020-11-16 11:30:06 +01:00
dependabot-preview[bot] 50e009efff build(deps): bump amplitude-js from 7.3.2 to 7.3.3 in /website/client (#12789) 
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 7.3.2 to 7.3.3.
- [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/v7.3.2...v7.3.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-16 11:16:05 +01:00
Shadow 8c98b7127e make guilds not display group plans as title section (#12761) 
* make guilds not display group plans as title section

* fix for parties as well

* task board for group plans now says group plans

* fix party title

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
 2020-11-14 19:35:09 +01:00
Sabe Jones 1c089c33a0 Merge branch 'develop' into release 2020-11-13 14:31:50 -06:00
Matteo Pagliazzi d3ba0346af Move more analytics to server (#12782) 
* track events on the client by default, remove unused ones

* fix lint, remove some calls to updateUser

* remove dead code from guide.js
 2020-11-13 15:42:46 +01:00
Matteo Pagliazzi 41de90e578 fix: make sure world state is not loaded every time a modal is opened, fix dev server caching on safari 2020-11-13 14:33:59 +01:00
Sabe Jones a863e79214 fix(teams): allow dismissal of approval requests, again 2020-11-10 15:25:12 -06:00
Sabe Jones 7b6f63958a fix(pets): better marshmallow positioning 
Fixes #12630
 2020-11-10 14:06:47 -06:00
Matteo Pagliazzi b5d8bcc0fe fix(categories): correct z-index, fix #12777 2020-11-10 19:10:39 +01:00
Matteo Pagliazzi 181b33101e Challenge Won Notification improvements (#12762) 
* challenge won notification: add more info

* update tests

* use new notification on web, fixes #7716

* wip design

* finalize design

* fix markdown rendering
 2020-11-10 18:47:13 +01:00
negue 4319bd5ad1 Update sidebar styles (#12744) 
* update sidebars to the filter-sidebar components

* update sidebars to the filter-sidebar components

* use object v-for instead of Object.keys
 2020-11-09 23:00:57 +01:00
negue f2c6838e95 update dropdowns to use the updated / styled components (#12758) 
* update dropdowns to use the updated / styled components

* update colors / behavior for colors

* remove class binding
 2020-11-09 22:26:21 +01:00
Sabe Jones a2cd79f20e chore(sprites): compile 2020-11-09 15:07:05 -06:00
Sabe Jones ef0b19f17e fix(backgrounds): corrected icon 2020-11-09 14:35:30 -06:00
Matteo Pagliazzi 27129754cd gems-promo: comment unused code 2020-11-09 16:34:52 +01:00
jbusa22 983aae7f87 Fixes #12730 - Tag filter not always cleared correctly when deleting active tag (#12737) 
* Update title for tabs not including challenges, guild and team

* add section titles to challenges, guilds, and groups

* Update dynamic title to use vuex action

* Remove duplicate key

* Actually remove duplicate key

* Fix section sub section in group

* Add note to implement setTitle when adding a page

* Add missing sections to dynamic title

* Features string not translated

* Use onGroupUpdate to update group titles

* Add watcher to challenges for dynamic title updates

* Small fixes

* Add register and login to title, remove duplicate keys

* Add home page dynamic title functionality

* Minor name changes

* Fix tag filtering on deletion

* Remove debuggers

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
 2020-11-09 12:25:22 +01:00
Matteo Pagliazzi 2e59260149 Revert "Revert "Analytics: track generic events through the server (#12735)"" 
This reverts commit 9d6fb2ca26.
 2020-11-09 11:34:20 +01:00
Matteo Pagliazzi 997cc9f3c5 Merge branch 'release' into develop 2020-11-09 11:33:53 +01:00
dependabot-preview[bot] 8a7b4db5ee build(deps): bump amplitude-js from 7.3.1 to 7.3.2 in /website/client (#12771) 
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 7.3.1 to 7.3.2.
- [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/v7.3.1...v7.3.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-09 10:50:39 +01:00
dependabot-preview[bot] 7adb33887e build(deps): bump bootstrap-vue from 2.18.1 to 2.19.0 in /website/client (#12772) 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.18.1 to 2.19.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.18.1...v2.19.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-09 10:50:30 +01:00
dependabot-preview[bot] 85d2e21510 build(deps): bump core-js from 3.6.5 to 3.7.0 in /website/client (#12770) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.6.5 to 3.7.0.
- [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.5...v3.7.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-09 10:50:11 +01:00
dependabot-preview[bot] 868a8a4e77 build(deps): bump sass from 1.28.0 to 1.29.0 in /website/client (#12769) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.28.0 to 1.29.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.28.0...1.29.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-11-09 10:50:05 +01:00