Sabe Jones
f7e9b467a5
fix(event): potions and bears
2019-12-20 10:12:45 -06:00
Sabe Jones
1c45d170dd
chore(sprites): compile
2019-12-19 16:58:08 -06:00
Sabe Jones
be107f02d3
Merge branch 'develop' into release
2019-12-19 16:55:10 -06:00
Sabe Jones
c4b16f86db
feat(event): Wonderland 2019-20
2019-12-19 16:54:27 -06:00
Matteo Pagliazzi
e4edab2b9d
Minimum password length + Static Pages fixes (was #11474 ) ( #11506 )
...
* Revert "Revert "Minimum password length + Static Pages fixes (#11474 )""
This reverts commit d1afbf4b92 .
* add min length for reset password
2019-12-18 19:02:15 +01:00
Sabe Jones
c36f01773f
Merge branch 'release' into develop
2019-12-17 14:50:29 -06:00
Sabe Jones
34983f1221
feat(event): turn on G1G1 2019
2019-12-17 14:04:55 -06:00
Matteo Pagliazzi
8f5a0cfe79
Onboarding guide and initial achievements refactoring ( #11536 )
...
* add achievements to user
* add placeholder strings
* add to achievements to common script
* add onboarding achievements category
* add notifications
* more notifications
* award achievements
* wip notification panel
* add achievements icons and copy
* do not count onboarding tasks for the created task achievement
* add notes
* sprites, fixes and completion status and reward
* add onboarding panel
* add toggle
* fix toggle size
* fix tests
* fix typo
* add notification
* start adding modal
* fix remove button positionin, timeout, progress bar
* modal + fixes
* disable broken social links from level up modal
* change toggle icon color on hover
* add border bottom to onboarding guide panel
* add collapse animation
* expanded onboarding on first open
* onboarding: flip toggle colors
* onboarding: show progress bar all the time
* onboarding: fix panel closing on click
* onboarding modal: add close icon and fix padding
* wip: add migration for existing users
* fix titles in guide
* fix achievements copy
* do not award completed task achievement when direction is down
* start implementing new achievements
* start migrating client
* remove social links from achievements modals
* prevent skipping tutorial + fix achievement notification
* sync fixes
* start redesign achievement modal
* misc fixes to achievements, polish generic achievement modal and hatched pet modal
* add special badge for onboarding
* fix badge condition
* modals fixes
* hatched pet modal: add close icon
* fix badge typo
* fix justin button
* new scrolling behavior for dropdowns
* fix strings capitalization
* add common tests
* add api unit tests
* add date check
* achievements modal polishing
* typos
* add toggle for achievements categories
* typo
* fix test
* fix edit avatar modal cannot be closed
* finish migration and correct launch date
* fix migration
* migration fixes
* fix tests
2019-12-16 17:20:47 +01:00
Nik
023173fada
Fix some tier username ( #11634 )
...
Onhover tier 3 and 5 the username still changes it's color
2019-12-13 14:27:21 +01:00
Matteo Pagliazzi
315604073b
Merge branch 'fix-antidotes-from-revert' of https://github.com/Xaz16/habitica into Xaz16-fix-antidotes-from-revert
2019-12-13 14:24:50 +01:00
Vamsi Jada
3a5e93f82e
Render profile tab content when profile page is loaded via url. Fixes #11525 ( #11588 )
...
* Fix for issue 11525: Updated profile and profilePage components to render profile tab content by default in profile page
* Modified profilePage.vue to set default value for startingPage prop
2019-12-13 14:18:52 +01:00
moniwang
a49f95e1a5
Modified the sort for name to be case-insensitive, fixes #11547 ( #11595 )
...
* Modified the sort for name to be case-insensitive
* Added comments for added piece of code sorting members
2019-12-13 14:17:06 +01:00
动力小车
0ac12cb6a5
fix(challengeItem.vue): guild name hidden caused by the fixed height of container ( #11618 )
...
fix #11500
2019-12-13 14:16:24 +01:00
Sabe Jones
e223311aac
fix(sprites): Robot color coding
2019-12-11 14:36:15 -06:00
Sabe Jones
7a52386daf
Merge branch 'release' into develop
2019-12-10 14:42:59 -06:00
Sabe Jones
efb4efd768
chore(sprites): compile
2019-12-10 14:41:49 -06:00
Sabe Jones
40ba81a5d9
feat(content): FFFFFF Achievements
2019-12-10 14:41:39 -06:00
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