Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,938 Commits 64 Branches 1,256 Tags
8fd7e1cd0044d0fb88b5b3bcd0bd1c92a77eb5b0
Commit Graph

2146 Commits

Author SHA1 Message Date
alexthomson1 8fd7e1cd00 Prevent accidentally closing tasks in edit mode. 2020-01-01 14:01:21 -07:00
dependabot-preview[bot] a504f69b8a build(deps): bump bootstrap-vue from 2.0.4 to 2.1.0 in /website/client (#11559) 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.0.4 to 2.1.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.0.4...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 08:56:31 +01:00
dependabot-preview[bot] ca8e6c74f6 build(deps): bump sass from 1.23.3 to 1.23.6 in /website/client (#11556) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.3 to 1.23.6.
- [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.23.3...1.23.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 08:55:50 +01:00
dependabot-preview[bot] b9dbc0f829 build(deps): bump eslint-plugin-vue in /website/client (#11557) 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v6.0.0...v6.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 08:55:22 +01:00
dependabot-preview[bot] 789248a8a4 build(deps): bump core-js from 3.4.0 to 3.4.1 in /website/client (#11558) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.4.0 to 3.4.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.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-18 08:54:57 +01:00
Aleksey eaad244181 Refactoring & Fix: editing group and challenges from user dashboard (#11418) 
* Refactoring & Feature: edit/delete group and challenge tasks

- Remove showOption from tasks props
- Pass all needed data to task for understand in mapGetter function which controls we should show
- Improve current solution with edit and delete logic

* Fix: this in template

* Fix & Test: extend tests, fix can Edit/Delete functions

* Fix: allow user edit challenge tasks on dashboard

* Fix: test case after code change

* fix import path

* Fix:

- Extend canEdit and canDelete functions with admin role
- Clarify canEdit and canDelete conditions
- Extend test cases
 2019-11-16 18:36:27 +01:00
Adam Fitzgibbon a859dbd646 updated tier styles so that they maintain their color on hover and click (#11513) 2019-11-16 18:16:23 +01:00
Vamsi Jada 106290a11e Changes for fixing issue 11420 (#11521) 2019-11-16 18:14:10 +01:00
citrusella 3fa0bac36f hatching modal auto height to accommodate longer strings (#11538) 2019-11-16 18:10:34 +01:00
Matteo Pagliazzi f093634cb2 Merge branch '9603_FixLeftPadding' of https://github.com/adamfitzgibbon/habitica into develop 2019-11-16 17:54:58 +01:00
Collin Styles eca1d8501c Hook up label to input for dontShowAgain checkbox (#11455) 
Now if the user clicks on the label for the checkbox, it will (un)check
the associated checkbox.
 2019-11-16 17:50:24 +01:00
Tanmoy Bhowmik 3fc0fec95e 11457 fix(task): remove z-index (#11460) 
* fix(task): remove z-index

* fix(task): add z-index on hover with a value of 11
 2019-11-16 17:43:29 +01:00
Matteo Pagliazzi 0e679f0fea settings fixes: show description for other extensions and remove unwanted changes from locales 2019-11-16 17:38:48 +01:00
Matteo Pagliazzi d55d3fc56d Merge branch 'firefox-extension-link' of https://github.com/Markkop/habitica into Markkop-firefox-extension-link 2019-11-16 17:33:10 +01:00
Sabe Jones 27d8ad32e6 Merge branch 'develop' into release 2019-11-14 15:09:18 -06:00
Sabe Jones 39fd60267c chore(sprites): compile 2019-11-14 15:08:57 -06:00
Matteo Pagliazzi 2842087a43 Achievements Fixes (#11540) 
* achievements fixes to timeout and modal

* fix string
 2019-11-13 21:59:48 +01:00
Sabe Jones 5212e72e77 Merge branch 'release' into develop 2019-11-12 15:36:18 -06:00
Sabe Jones dc303fb1de feat(content): enable some Magic Hatching Potions 2019-11-12 15:31:17 -06:00
Matteo Pagliazzi 2d4516eaa7 Merge pull request #11527 from HabitRPG/dependabot/npm_and_yarn/website/client/eslint-plugin-vue-6.0.0 
build(deps): bump eslint-plugin-vue from 5.2.3 to 6.0.0 in /website/client
 2019-11-11 11:23:27 +01:00
dependabot-preview[bot] 44a7a0159b build(deps): bump eslint-plugin-vue in /website/client 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 5.2.3 to 6.0.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v5.2.3...v6.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 10:18:11 +00:00
dependabot-preview[bot] 2091c407b0 build(deps): bump core-js from 3.3.6 to 3.4.0 in /website/client 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.3.6 to 3.4.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.3.6...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 10:16:37 +00:00
Sabe Jones b441cfa9f3 Merge branch 'release' into develop 2019-11-05 10:30:30 -06:00
Sabe Jones b4a517f2d3 chore(sprites): compile 2019-11-05 10:29:48 -06:00
Matteo Pagliazzi 159b4857ba build(deps): bump core-js from 3.3.4 to 3.3.6 in /website/client (#11510) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.3.4 to 3.3.6.
- [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.3.4...v3.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 15:21:25 +01:00
dependabot-preview[bot] a2a2fea40f build(deps): bump svgo from 1.3.0 to 1.3.2 in /website/client (#11511) 
Bumps [svgo](https://github.com/svg/svgo) from 1.3.0 to 1.3.2.
- [Release notes](https://github.com/svg/svgo/releases)
- [Changelog](https://github.com/svg/svgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svg/svgo/compare/v1.3.0...v1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 15:21:08 +01:00
dependabot-preview[bot] 3c1c92dd68 build(deps): bump sass from 1.23.1 to 1.23.3 in /website/client (#11512) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.1 to 1.23.3.
- [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.23.1...1.23.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 15:20:58 +01:00
dependabot-preview[bot] 8ab50dc316 build(deps): bump core-js from 3.3.4 to 3.3.6 in /website/client 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.3.4 to 3.3.6.
- [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.3.4...v3.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-04 13:55:47 +00:00
Adam Fitzgibbon 25603634db update to use bootstrap built in spacing classes 2019-11-03 20:14:22 -06:00
Sarah Eisa 84d76a2ebc Fix market dropdownmenu default text (#11481) 
* Fix market dropdownmenu default text

Add text attribute to b-dropdown in filterDropdown component

* Fix market dropdownmenu default text 

delete the text attribute form b-dropdown because it wasn't the right  solution
In filterDropdown b-dropdown tag change the span slot to button-content
to match the recent changes in bootstrap vue
 2019-11-02 17:59:57 +01:00
Matteo Pagliazzi da4dd07de1 fix linting script to make sure errors are reported 2019-11-02 13:08:37 +01:00
Sabe Jones 6e9ab1dbbb Merge branch 'release' into develop 2019-11-01 20:14:55 -05:00
Sabe Jones 74d3141195 chore(sprites): compile 2019-11-01 20:13:59 -05:00
Sabe Jones a2a251b2f1 chore(event): end Fall Festival & Habitoween 2019-11-01 20:13:52 -05:00
leodalmacio 853b9313f6 [Issue-11394] Challenge Creation/Edit Screen Should Not Close Except By X Button (#11409) 2019-11-01 19:02:22 +01:00
Julien Midedji a7c814262b Set specific subpage that is requested when profile is shown (#11412) 2019-11-01 19:02:01 +01:00
Adam Fitzgibbon f02992faa5 moved the free hairstyles to the top of the modal (#11416) 2019-11-01 19:01:46 +01:00
Evelyn Stender d98614d403 Show 0 in the gem prize box if gem prize is null (#11453) 
* show 0 in the gem prize box if gem prize is null

* adding space between brackets
 2019-11-01 19:01:28 +01:00
Adam Fitzgibbon cf00bddd6f add group by for hatchable sort (#11459) 
* add group by for hatchable sort

* fix display bug when pets are owned
 2019-11-01 19:00:59 +01:00
Adam Fitzgibbon dfd79c9c1a Use username in challenge member dropdown (#11478) 
* update challenge member dropdown and api to display and search by username rather than display name

* remove accidental whitespace

* fix api test
 2019-11-01 19:00:42 +01:00
Sabe Jones 5cf2c592b5 chore(sprites): compile 2019-10-31 15:03:35 -05:00
Sabe Jones d79e0b32d2 feat(event): Habitoween 2019 2019-10-31 15:03:25 -05:00
Sabe Jones d1afbf4b92 Revert "Minimum password length + Static Pages fixes (#11474)" 
This reverts commit e1d30eec98.
 2019-10-31 13:16:09 -05:00
Matteo Pagliazzi e1d30eec98 Minimum password length + Static Pages fixes (#11474) 
* password min length: server + client side registering

* tweak text, add tests

* misc

* use red border for invalid inputs

* fix auth form for groups

* remove default firefox box shadown on invalid elements

* fix css in authForm

* fix margings

* misc fixes to forms and buttons

* fix typo
 2019-10-30 13:47:35 +01:00
Adam Fitzgibbon 2ca3c225c4 some additional padding 2019-10-29 22:03:57 -05:00
Adam Fitzgibbon 9ceb45b058 fix padding on various pages 2019-10-28 23:04:13 -05:00
dependabot-preview[bot] 1cf3ba26b7 build(deps): bump eslint from 6.5.1 to 6.6.0 in /website/client (#11488) 
Bumps [eslint](https://github.com/eslint/eslint) from 6.5.1 to 6.6.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.5.1...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 11:54:13 +01:00
Matteo Pagliazzi 11b7cfe176 Merge pull request #11486 from HabitRPG/dependabot/npm_and_yarn/website/client/core-js-3.3.4 
build(deps): bump core-js from 3.3.3 to 3.3.4 in /website/client
 2019-10-28 11:51:38 +01:00
dependabot-preview[bot] 43acb6da95 build(deps): bump core-js from 3.3.3 to 3.3.4 in /website/client 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.3.3 to 3.3.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.3.3...v3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 07:53:48 +00:00
dependabot-preview[bot] ee7e40b5c8 build(deps): bump eslint-config-habitrpg in /website/client 
Bumps [eslint-config-habitrpg](https://github.com/HabitRPG/eslint-config) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/HabitRPG/eslint-config/releases)
- [Commits](https://github.com/HabitRPG/eslint-config/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-28 07:52:33 +00:00