Sabe Jones
3ba8b04962
Merge branch 'release' into develop
2019-12-26 14:21:06 -06:00
Sabe Jones
da9e07d71a
chore(news): bailey
2019-12-26 14:20:42 -06:00
Yo
04a9c97393
Fix Typos ( #11644 )
...
* Fix Typos
* Fix More Typos
2019-12-23 17:52:55 +01: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
Phillip Thelen
cc7d065445
Fix purchasing non-recurring subscriptions ( #11646 )
...
* Fix purchasing non-recurring subscriptions
This fixes a bug where non-recurring subscriptions were not correctly purchased on iOS.
* fix linter errors
* refactor(lint): line length
2019-12-19 11:13:39 -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
9fe28c6d51
fix(g1g1): send promo confirmation to self
2019-12-17 14:16:56 -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
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
Jonathan Duncan
a45b04b1cf
APIDoc update for Tasks: fixes #10943 ( #11594 )
...
* Adding monthly and yearly to the frequency parameter.
* Adjusting frequency description to be more accurate.
* Adding missing fields: daysOfMonth and weeksOfMonth.
* Adjusting line length to meet lint standards.
2019-12-13 14:18:02 +01:00
Carl Vuorinen
cd90a281c2
Prevent duplicate challenge tasks ( #11502 )
...
* Implement atomic user challenges update
Prevents multiple concurrent requests from passing through
Fixes #11295
* Move user challenges update to separate method
* Rename challenge syncToUser to syncTasksToUser
Now that adding the challenge to user is separated, this methods main purpose is to sync the tasks
* Fix lint errors
2019-12-13 14:14:57 +01:00
Sabe Jones
7a52386daf
Merge branch 'release' into develop
2019-12-10 14:42:59 -06:00
Sabe Jones
40ba81a5d9
feat(content): FFFFFF Achievements
2019-12-10 14:41:39 -06: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
1224d6d0c9
feat(content): Armoire and BGs 2019-12
2019-12-03 20:25:50 +00:00
Sabe Jones
3466e62aa5
Merge branch 'release' into develop
2019-12-02 17:16:17 -06:00
Sabe Jones
11ebc6c397
chore(event): end Turkeys, Bailey
2019-12-02 17:15:41 -06:00
Phillip Thelen
b108b047cd
Improvements and fixes for push notifications ( #11507 )
...
* Strip markdown from push notifications
* Revert "Strip markdown from push notifications"
This reverts commit 4741e584c63031d0d4609e18a4e4f082d4c4e72e.
* correctly set type for mention push notifications
* Add unformattedText field to chat messages
* fiix lint errors
* Add check that markdown formatting is stripped from messages
* Add check for markdown formatting in messages.
2019-11-29 18:46:26 +01:00
Sabe Jones
45efbc1e4b
Merge branch 'develop' into release
2019-11-27 15:48:03 -06:00
Sabe Jones
e597906f35
feat(content): Harvest Feast 2019
2019-11-27 15:45:37 -06:00
Sabe Jones
6395070eb6
Award mystery items at cron ( #11519 )
...
* feat(subscriber): award mystery items at cron
* fix(mystery): backfill skipped months
* fix(mystery): adjust subscriber text
* fix(mystery): correct moment logic
and remove irrelevant tests
* fix(mystery): build set one month in advance
* fix(mystery): don't add empty set to Time Travelers
* refactor(mystery): readability
2019-11-27 12:10:56 -06:00
Sabe Jones
e8f9c4953e
Merge branch 'release' into develop
2019-11-26 15:59:03 -06:00
Sabe Jones
194f2d512a
feat(content): Amber Hatching Potion Quest
2019-11-26 15:58:18 -06:00
Matteo Pagliazzi
8983e7fea2
Merge pull request #11562 from HabitRPG/sabrecat/bulk-email-fix
...
Better promise handling for bulk emailing
2019-11-25 16:48:15 +01:00
Sabe Jones
2362976f14
Merge branch 'develop' into release
2019-11-21 16:17:43 -06:00
Sabe Jones
e0b8cfbaa7
feat(content): mystery items Nov 2019
2019-11-21 16:17:06 -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
Sabe Jones
b4efe11e6a
fix(async): remove catch, add return
2019-11-19 12:59:53 -06:00
Sabe Jones
46822ecbae
fix(email): better promise handling
2019-11-19 12:53:21 -06:00
Xaz16
960985dee5
Merge branch 'develop' into fix-antidotes-from-revert
2019-11-17 23:54:09 +03:00
Evelyn Stender
5f0672f3a6
Allow update webhook label with an empty string ( #11479 )
...
* Allow update webhook label with an empty string
* Adding comment to explain the label check
2019-11-16 17:52:27 +01:00
Sabe Jones
645f40f7e0
feat(content): Delightful Dinos Bundle
2019-11-14 15:08:45 -06:00
Sabe Jones
dc303fb1de
feat(content): enable some Magic Hatching Potions
2019-11-12 15:31:17 -06:00
Sabe Jones
a32622c81f
fix(invites): correct link constant
2019-11-05 10:47:08 -06:00
Sabe Jones
b441cfa9f3
Merge branch 'release' into develop
2019-11-05 10:30:30 -06:00
Sabe Jones
3e2a49103e
feat(content): Armoire and BGs 2019-11
...
and disable October Magic Potions
2019-11-05 10:29:39 -06:00
Matteo Pagliazzi
9988b1e82d
Revert "fix(challenge export): do not fetch users and tasks concurrently"
...
This reverts commit 4d88787ba0 .
2019-11-02 14:24:14 +01:00
Matteo Pagliazzi
4d88787ba0
fix(challenge export): do not fetch users and tasks concurrently
2019-11-02 12:43:51 +01:00
Sabe Jones
6e9ab1dbbb
Merge branch 'release' into develop
2019-11-01 20:14:55 -05:00
Sabe Jones
a2a251b2f1
chore(event): end Fall Festival & Habitoween
2019-11-01 20:13:52 -05: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
cheng-shiqi
2741721161
Fix: Preventing adding duplicated task ID to taskOrder fix for #11385 ( #11408 )
...
* Preventing adding duplicated task ID to taskOrder object when creating new tasks
* refactor: not using Sets for taskOrderToAdd[]
* refactor: remove unnecessary checking
2019-11-01 19:00:21 +01:00
Sabe Jones
52719ac685
fix(lint): line length
2019-10-31 15:32:20 -05:00
Sabe Jones
d79e0b32d2
feat(event): Habitoween 2019
2019-10-31 15:03:25 -05:00