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

92 Commits

Author SHA1 Message Date
Xaz16 53a15f9fa0 fix: add images for debuff potions, update sprites 2019-12-07 23:03:26 +03:00
Xaz16 aa1fcb4956 Merge remote-tracking branch 'upstream/develop' into fix-antidotes-from-revert 2019-12-07 22:32:25 +03:00
negue 97a1d0f474 Storybook Example (#11494) 
* 🎉 Working example of storybook and vue

* remove the older storybook version

* build storybook after client was built

* move storybook:build to npm-postintall

* remove automatically created eslint-disables + fix comment

* add back needed eslint :P + add @storybook/vue as devDep

* fix packagelock

* fix lint

* auto fixed lints + ignore dist/ node_modules/

* update package-lock.json

* add postbuild and readme

* add back customize config

* fix readme

* fix links in readme

* revert postbuild command
 2019-12-05 22:35:23 +01:00
Sabe Jones b6371971a2 Merge branch 'release' into develop 2019-12-03 20:27:27 +00:00
Sabe Jones 3f1e8ceae4 chore(sprites): compile 2019-12-03 20:26:20 +00:00
Nik 9379325731 Fix edit challenge twice bug (#11591) 
Description: Use of a same object property group for differents types between a
challenge and workingChallenge
workingChallenge use group as and id but this.challenge have a group
object

Fix: Wait for server response for challenge edit. Set this.challenge
from response and not directly from form data workingChallenge
 2019-11-29 20:12:56 +01:00
alicemliu 59c4b32d69 remain on party invites tab after removing invite - fixes #11523 (#11548) 
* fixed party members view to remain on invites tab after removing invite if any remain

* removed redundant viewInvites() call
 2019-11-29 20:09:03 +01:00
Sabe Jones 45efbc1e4b Merge branch 'develop' into release 2019-11-27 15:48:03 -06:00
Sabe Jones faec0bc979 chore(sprites): compile 2019-11-27 15:45:46 -06:00
Sabe Jones e8f9c4953e Merge branch 'release' into develop 2019-11-26 15:59:03 -06:00
Sabe Jones ae9bca3ac7 chore(sprites): compile 2019-11-26 15:58:27 -06:00
Adam Fitzgibbon f70f7b2a1c update members list and count when joining or leaving challenge (#11542) 
* update members list and count when joining or leaving challenge

* remove custom ui logic and use response/fetch data to update challenge
 2019-11-25 17:19:52 +01:00
Nik bfd960b7b6 Force reward value to 0 when empty field (#11564) 2019-11-25 17:11:01 +01:00
negue 91d75bae29 Avatar Edit Modal: addtional none options (#11539) 
* addtional none options

* show gear-"none"-options as active if property has no value
 2019-11-25 17:07:16 +01:00
Sabe Jones bff88434fd fix(resting): correction corrections 2019-11-25 09:03:04 -06:00
Sabe Jones a1d31e37a3 fix(strings): corrections 2019-11-25 09:02:23 -06:00
Sabe Jones 2362976f14 Merge branch 'develop' into release 2019-11-21 16:17:43 -06:00
Sabe Jones 99b63456c8 chore(sprites): compile 2019-11-21 16:17:16 -06:00
Sabe Jones 4ca4fd9ae7 fix(teams): allow dismissal of taks approval requests 2019-11-21 16:16:28 -06:00
Sabe Jones 66b2b47f87 Merge branch 'release' into develop 2019-11-19 15:26:23 -06:00
Sabe Jones 23bd51d486 chore(news): BlogBailey 2019-11-19 15:25:53 -06:00
Xaz16 960985dee5 Merge branch 'develop' into fix-antidotes-from-revert 2019-11-17 23:54:09 +03: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 dc303fb1de feat(content): enable some Magic Hatching Potions 2019-11-12 15:31:17 -06: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
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