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

2291 Commits

Author SHA1 Message Date
Sabe Jones ee9eb3f78a Merge branch 'release' into sabrecat/timetrav-bgs 2020-01-21 14:58:51 -06:00
Sabe Jones 04960f8ff8 chore(news): Bailey 2020-01-16 16:11:40 -06:00
Sabe Jones 0fd3e42fb2 fix(timetrav): pinning, mobile order 2020-01-16 10:06:36 -06:00
Matteo Pagliazzi 615cec6ae0 Merge pull request #11663 from lelandhwu/fix-challenge-category-change 
fix bug in which editing challenge will not allow editing categories (fixes #11662)
 2020-01-14 13:22:21 +01:00
Matteo Pagliazzi 45668a0ba9 Merge pull request #11683 from youcandanch/local-docker-fixes 
Fix issues with local Docker development.
 2020-01-14 13:09:32 +01:00
Matteo Pagliazzi 4a88659364 Merge pull request #11665 from Alys/flag-modal 
show Reset Flag Count button to moderators regardless of post's report status
 2020-01-14 13:02:26 +01:00
Matteo Pagliazzi e4ba2bfc7e Merge pull request #11637 from Xaz16/trigger-vue-reactivity-for-user 
Trigger vue reactivity for user
 2020-01-14 13:00:07 +01:00
Matteo Pagliazzi 646ac08cb2 Merge pull request #11706 from Kevin-DDR/fixBackground 
Set the default year for the background meny to 2020 Fix for  #11703
 2020-01-14 12:58:22 +01:00
Matteo Pagliazzi 6ac959b9c6 Merge pull request #11722 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/vue-5.3.1 
build(deps): bump @storybook/vue from 5.2.8 to 5.3.1 in /website/client
 2020-01-13 12:50:13 +01:00
Matteo Pagliazzi 484b9f09af Merge pull request #11713 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-links-5.3.1 
build(deps): bump @storybook/addon-links from 5.2.8 to 5.3.1 in /website/client
 2020-01-13 12:50:01 +01:00
dependabot-preview[bot] 0bfa0cc068 build(deps): bump @storybook/addon-links in /website/client 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 5.2.8 to 5.3.1.
- [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.1/addons/links)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 11:49:24 +00:00
dependabot-preview[bot] 376a0efa67 build(deps): bump @storybook/vue from 5.2.8 to 5.3.1 in /website/client 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.8 to 5.3.1.
- [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.1/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 11:49:03 +00:00
Matteo Pagliazzi f6f30e8f5d Merge pull request #11724 from HabitRPG/dependabot/npm_and_yarn/website/client/axios-0.19.1 
build(deps): bump axios from 0.19.0 to 0.19.1 in /website/client
 2020-01-13 12:48:36 +01:00
Matteo Pagliazzi 6c8321c7ec Merge pull request #11726 from HabitRPG/dependabot/npm_and_yarn/website/client/sass-loader-8.0.1 
build(deps): bump sass-loader from 8.0.0 to 8.0.1 in /website/client
 2020-01-13 12:48:17 +01:00
Matteo Pagliazzi 74ae724e33 Merge pull request #11719 from HabitRPG/dependabot/npm_and_yarn/website/client/vue2-perfect-scrollbar-1.3.0 
build(deps): bump vue2-perfect-scrollbar from 1.2.4 to 1.3.0 in /website/client
 2020-01-13 12:47:47 +01:00
dependabot-preview[bot] 78306fe33d build(deps): bump sass-loader from 8.0.0 to 8.0.1 in /website/client 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 8.0.0 to 8.0.1.
- [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.0...v8.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 11:47:30 +00:00
Matteo Pagliazzi c7fd7aefc2 Merge pull request #11712 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-actions-5.3.1 
build(deps): bump @storybook/addon-actions from 5.2.8 to 5.3.1 in /website/client
 2020-01-13 12:46:46 +01:00
dependabot-preview[bot] c8db6a35f9 build(deps): bump @storybook/addon-actions in /website/client 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.8 to 5.3.1.
- [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.1/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 11:46:21 +00:00
dependabot-preview[bot] 14c1bddca2 build(deps): bump axios from 0.19.0 to 0.19.1 in /website/client 
Bumps [axios](https://github.com/axios/axios) from 0.19.0 to 0.19.1.
- [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/v0.19.0...0.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 11:45:44 +00:00
Matteo Pagliazzi 2463287161 Merge pull request #11711 from HabitRPG/dependabot/npm_and_yarn/website/client/sass-1.24.4 
build(deps): bump sass from 1.24.2 to 1.24.4 in /website/client
 2020-01-13 12:44:46 +01:00
Matteo Pagliazzi e440a344e3 Merge pull request #11716 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-knobs-5.3.1 
build(deps): bump @storybook/addon-knobs from 5.2.8 to 5.3.1 in /website/client
 2020-01-13 12:44:02 +01:00
Matteo Pagliazzi acec30cb05 Merge pull request #11717 from HabitRPG/dependabot/npm_and_yarn/website/client/hellojs-1.18.4 
build(deps): bump hellojs from 1.18.1 to 1.18.4 in /website/client
 2020-01-13 12:43:51 +01:00
Matteo Pagliazzi ee51878c23 Merge pull request #11715 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-notes-5.3.1 
build(deps): bump @storybook/addon-notes from 5.2.8 to 5.3.1 in /website/client
 2020-01-13 12:43:38 +01:00
Matteo Pagliazzi 650c9044c8 Merge pull request #11710 from HabitRPG/dependabot/npm_and_yarn/website/client/bootstrap-vue-2.2.0 
build(deps): bump bootstrap-vue from 2.1.0 to 2.2.0 in /website/client
 2020-01-13 12:43:10 +01:00
dependabot-preview[bot] c934cf990d build(deps): bump vue2-perfect-scrollbar in /website/client 
Bumps [vue2-perfect-scrollbar](https://github.com/mercs600/vue2-perfect-scrollbar) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/mercs600/vue2-perfect-scrollbar/releases)
- [Commits](https://github.com/mercs600/vue2-perfect-scrollbar/commits/1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:12:35 +00:00
dependabot-preview[bot] fdfe76ca16 build(deps): bump hellojs from 1.18.1 to 1.18.4 in /website/client 
Bumps [hellojs](https://github.com/MrSwitch/hello.js) from 1.18.1 to 1.18.4.
- [Release notes](https://github.com/MrSwitch/hello.js/releases)
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.18.1...v1.18.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:11:33 +00:00
dependabot-preview[bot] 5762f85798 build(deps): bump @storybook/addon-knobs in /website/client 
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs) from 5.2.8 to 5.3.1.
- [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.1/addons/knobs)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:10:42 +00:00
dependabot-preview[bot] d1ecb960b0 build(deps): bump @storybook/addon-notes in /website/client 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.2.8 to 5.3.1.
- [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.1/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:09:31 +00:00
dependabot-preview[bot] 47fb821956 build(deps): bump sass from 1.24.2 to 1.24.4 in /website/client 
Bumps [sass](https://github.com/sass/dart-sass) from 1.24.2 to 1.24.4.
- [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.2...1.24.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:04:57 +00:00
dependabot-preview[bot] d0eb6196d3 build(deps): bump bootstrap-vue from 2.1.0 to 2.2.0 in /website/client 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.1.0 to 2.2.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.1.0...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:03:56 +00:00
dependabot-preview[bot] bb50586622 build(deps): bump core-js from 3.6.1 to 3.6.3 in /website/client 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.6.1 to 3.6.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.6.1...v3.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:02:47 +00:00
Sabe Jones 8b569e2136 PMs rebuild (#11360) 
* feat(messages): big PMs refactor

* add private messages route

* move to page

* WIP - header + begin with the sidebar

* extract userLabel + style sidebar + extract converstation item

* correct conversation item style

* toggle switch style

* add contributor / backer to conversation user-label

* fix shadows

* fix the conversations list (ignoring own sent)

* selected conversation label

* faceAvatar component

* fix message / avatar height

* fix message list / empty messages height

* new message padding/styles/functionality - finished sidebar conversation styling -

* fix loading messages + perfect-scrollbar

* fix load more line

* fix loading label

* open new conversation from outside

* if the user doesn't have avatar-data inside the conversation and does not exist anymore, just load/set the user name

* search bar new icon / style

* block using from conversation context-menu

* fix lint

* fix merge / lint

* fix merge

* first separate page

* fix tooltips + full width private message + card max width + more responsive

* separate conversations methods, to prevent circular deps

* update eslint config

* fix open new private message

* remove unneeded close icon + fix toggle-switch layout

* same content height on empty conversations - remove border / box-shadow

* canLoadMore = false

* remove inbox conditions on chat components

* hide footer / fix empty sidebar

* floating shadow

* remove tooltip on selected conversation user + pm always full-size

* show avatar on empty conversation

* disable face-avatar

* fix faceAvatar + story

* fix loading conversation messages while switching the conversation

* refresh private-messages page when you are already on it

* add countbadge knob to change the example

* fix lint

* fix hide tooltip + align header correctly

* disable perfect scroll

* load messages on refresh event

* fix header label + conversation actions not breaking layout on hover

* add gifting banner to the max height calculation

* correct chunk name

Co-authored-by: negue <negue@users.noreply.github.com>
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
 2020-01-12 19:34:40 +01:00
Matteo Pagliazzi da878dfa1a Disabled auto notification dismiss for received card on click (#11690) 2020-01-11 18:13:47 +01:00
alexthomson1 8abf0dd11d Prevent accidentally closing tasks in edit mode. (#11686) 2020-01-11 18:13:39 +01:00
Sabe Jones f47ccfdb6d chore(event): enable winter customizations 2020-01-10 15:32:36 -06:00
Sabe Jones 38b61030df Merge branch 'develop' into release 2020-01-09 16:44:07 -06:00
Sabe Jones c1a4c03883 fix(outage): emails warning 2020-01-09 16:43:18 -06:00
Sabe Jones 59fb9f1c7a feat(timetrav): implement bgs in avatar modal 2020-01-09 10:26:36 -06:00
Sabe Jones 0f4a5ebe6c Merge branch 'release' into sabrecat/timetrav-bgs 2020-01-09 09:59:09 -06:00
Kevin-DDR a3277eeea3 Set the default year ofr the background meny to 2020 2020-01-09 08:59:51 +01:00
Sabe Jones 2c75e0bd49 Merge branch 'release' into develop 2020-01-08 11:13:19 -06:00
Sabe Jones 99c0a9d05d fix(promo): sub page 2020-01-08 11:12:47 -06:00
Sabe Jones fe9af263dd Merge branch 'release' into develop 2020-01-07 11:48:09 -06:00
Sabe Jones 782f8f0605 chore(sprites): compile 2020-01-07 11:43:34 -06:00
Sabe Jones 25809e5c00 feat(content): Armoire, BGs 2020-01-07 11:43:14 -06:00
Sabe Jones f6ecc1cb84 chore(promo): end g1g1 2020-01-07 10:13:32 -06:00
dependabot-preview[bot] 3fa8ba1a7d build(deps): bump inspectpack from 4.2.2 to 4.3.0 in /website/client (#11692) 
Bumps [inspectpack](https://github.com/FormidableLabs/inspectpack) from 4.2.2 to 4.3.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.2.2...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 11:04:12 +01:00
dependabot-preview[bot] b6d461565c build(deps): bump sass from 1.24.0 to 1.24.2 in /website/client (#11691) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.24.0 to 1.24.2.
- [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.0...1.24.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 11:04:00 +01:00
dependabot-preview[bot] 270ec241b3 build(deps): bump eslint-plugin-vue in /website/client (#11694) 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.1.1...v6.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-07 11:03:36 +01:00
Sabe Jones d7d5d7e85a Merge branch 'release' into develop 2020-01-06 12:13:00 -06:00