8f7e5d544e
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-07 14:55:16 -05:00
e17b86a1f6
fix(bug-report): relevant change from #13922
2022-04-07 14:48:26 -05:00
2181ab9713
Redesign: "Day Start Adjustment" ( #13910 )
...
* Merge Custom Day Start and Timezone into one Component
* ui changes
* change translation text
* typo
2022-04-07 14:37:07 -05:00
8cb8411cc6
Show "Next Hourglass" Month ( #13860 )
...
* Show "Next Hourglass" Month
* fix lint
* lint,
* lint
* lint..
* linting bad
* ui fixes
* remove additional margin
* show next hourglass date to debug further
* WIP tests - maybe broken logic
* flex:1 doesn't work - so stats columns now at 33% width
* fix(cron): lint and short circuit
* refactor logic
* update test dates using timezone
* also check for the timezone date
* fix timezone for tests
* fixing the test dates?
* fixing the test dates?
* change nextHourglass logic + update gem cap label / value
* fix lint
* dont add gemsBought to it
* remove tooltip
Co-authored-by: SabreCat <sabe@habitica.com >
2022-04-06 16:30:13 -05:00
05cf0cb50d
build(deps): bump stripe from 8.212.0 to 8.215.0 ( #13919 )
...
Bumps [stripe](https://github.com/stripe/stripe-node ) from 8.212.0 to 8.215.0.
- [Release notes](https://github.com/stripe/stripe-node/releases )
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-node/compare/v8.212.0...v8.215.0 )
---
updated-dependencies:
- dependency-name: stripe
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-06 11:27:13 -04:00
40113b0458
Merge branch 'develop' into sabrecat/teams-rebase
2022-04-05 13:56:25 -05:00
eed6cfaf6d
Translated using Weblate (Japanese)
...
Currently translated at 99.5% (2567 of 2579 strings)
Translated using Weblate (Japanese)
Currently translated at 99.4% (2566 of 2579 strings)
Translated using Weblate (Italian)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 98.0% (2528 of 2579 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 97.8% (2524 of 2579 strings)
Translated using Weblate (Hebrew)
Currently translated at 100.0% (134 of 134 strings)
Translated using Weblate (Hebrew)
Currently translated at 58.9% (33 of 56 strings)
Translated using Weblate (Hebrew)
Currently translated at 84.6% (11 of 13 strings)
Translated using Weblate (Hebrew)
Currently translated at 46.8% (44 of 94 strings)
Translated using Weblate (Hebrew)
Currently translated at 57.6% (64 of 111 strings)
Translated using Weblate (Hebrew)
Currently translated at 73.7% (45 of 61 strings)
Translated using Weblate (Hebrew)
Currently translated at 18.1% (4 of 22 strings)
Translated using Weblate (Japanese)
Currently translated at 99.3% (2563 of 2579 strings)
Translated using Weblate (Hebrew)
Currently translated at 49.0% (1264 of 2579 strings)
Translated using Weblate (Hebrew)
Currently translated at 70.0% (150 of 214 strings)
Translated using Weblate (Hebrew)
Currently translated at 46.4% (59 of 127 strings)
Translated using Weblate (Hebrew)
Currently translated at 66.9% (249 of 372 strings)
Translated using Weblate (Hebrew)
Currently translated at 71.5% (133 of 186 strings)
Translated using Weblate (Hebrew)
Currently translated at 98.9% (97 of 98 strings)
Translated using Weblate (Hebrew)
Currently translated at 45.0% (307 of 682 strings)
Translated using Weblate (Hebrew)
Currently translated at 67.9% (89 of 131 strings)
Translated using Weblate (Hebrew)
Currently translated at 72.9% (151 of 207 strings)
Translated using Weblate (Hebrew)
Currently translated at 98.5% (132 of 134 strings)
Translated using Weblate (Hebrew)
Currently translated at 91.2% (333 of 365 strings)
Translated using Weblate (Hebrew)
Currently translated at 100.0% (98 of 98 strings)
Translated using Weblate (Hebrew)
Currently translated at 97.7% (131 of 134 strings)
Translated using Weblate (Hebrew)
Currently translated at 61.9% (122 of 197 strings)
Translated using Weblate (Hebrew)
Currently translated at 98.2% (55 of 56 strings)
Translated using Weblate (Hebrew)
Currently translated at 68.0% (64 of 94 strings)
Translated using Weblate (Hebrew)
Currently translated at 91.8% (102 of 111 strings)
Translated using Weblate (Hebrew)
Currently translated at 100.0% (22 of 22 strings)
Translated using Weblate (Hebrew)
Currently translated at 100.0% (8 of 8 strings)
Translated using Weblate (Hebrew)
Currently translated at 93.2% (167 of 179 strings)
Translated using Weblate (Hebrew)
Currently translated at 81.4% (44 of 54 strings)
Translated using Weblate (Hebrew)
Currently translated at 76.2% (569 of 746 strings)
Translated using Weblate (Hebrew)
Currently translated at 74.8% (95 of 127 strings)
Translated using Weblate (Hebrew)
Currently translated at 83.8% (312 of 372 strings)
Translated using Weblate (Hebrew)
Currently translated at 96.7% (180 of 186 strings)
Translated using Weblate (Hebrew)
Currently translated at 100.0% (98 of 98 strings)
Translated using Weblate (Hebrew)
Currently translated at 69.4% (91 of 131 strings)
Translated using Weblate (Hebrew)
Currently translated at 88.4% (183 of 207 strings)
Translated using Weblate (Japanese)
Currently translated at 99.1% (2557 of 2579 strings)
Translated using Weblate (Japanese)
Currently translated at 99.1% (2556 of 2579 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (179 of 179 strings)
Translated using Weblate (Japanese)
Currently translated at 99.4% (178 of 179 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (French)
Currently translated at 100.0% (179 of 179 strings)
Translated using Weblate (French)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (French)
Currently translated at 100.0% (207 of 207 strings)
Translated using Weblate (Japanese)
Currently translated at 98.9% (2551 of 2579 strings)
Translated using Weblate (French)
Currently translated at 100.0% (2579 of 2579 strings)
Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net >
Co-authored-by: JoanZeppeli <x17501668978@163.com >
Co-authored-by: Omer I.S <omeritzicschwartz@gmail.com >
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com >
Co-authored-by: Weblate <noreply@weblate.org >
Co-authored-by: mattya 226 <worldworld1114@gmail.com >
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/he/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/it/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/he/
Translate-URL: https://translate.habitica.com/projects/habitica/challenge/he/
Translate-URL: https://translate.habitica.com/projects/habitica/character/he/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/he/
Translate-URL: https://translate.habitica.com/projects/habitica/content/he/
Translate-URL: https://translate.habitica.com/projects/habitica/defaulttasks/he/
Translate-URL: https://translate.habitica.com/projects/habitica/front/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/front/he/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/he/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/he/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/he/
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/he/
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/he/
Translate-URL: https://translate.habitica.com/projects/habitica/messages/he/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/he/
Translate-URL: https://translate.habitica.com/projects/habitica/quests/he/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/he/
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/he/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/he/
Translate-URL: https://translate.habitica.com/projects/habitica/spells/he/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/he/
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/he/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Challenge
Translation: Habitica/Character
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Defaulttasks
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Inventory
Translation: Habitica/Loginincentives
Translation: Habitica/Messages
Translation: Habitica/Pets
Translation: Habitica/Quests
Translation: Habitica/Questscontent
Translation: Habitica/Rebirth
Translation: Habitica/Settings
Translation: Habitica/Spells
Translation: Habitica/Subscriber
Translation: Habitica/Tasks
2022-04-05 16:35:54 +02:00
39b39387d3
chore(sprites): compile CSS
2022-04-04 14:54:09 -05:00
c3278a3baf
2022-04 Backgrounds & Enchanted Armoire Items ( #13915 )
...
* 2022-04 Backgrounds & Enchanted Armoire Items
* remove spritesmith-main.css
* adding spritesmith-main.css back in
* css fix
2022-04-04 14:53:34 -05:00
18af9f8b40
build(deps): bump moment from 2.29.1 to 2.29.2 ( #13921 )
...
Bumps [moment](https://github.com/moment/moment ) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases )
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.2 )
---
updated-dependencies:
- dependency-name: moment
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-04 10:58:05 -04:00
de36afc174
build(deps): bump body-parser from 1.19.2 to 1.20.0 ( #13920 )
...
Bumps [body-parser](https://github.com/expressjs/body-parser ) from 1.19.2 to 1.20.0.
- [Release notes](https://github.com/expressjs/body-parser/releases )
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md )
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.2...1.20.0 )
---
updated-dependencies:
- dependency-name: body-parser
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-04 10:57:45 -04:00
fbb40c0d07
build(deps): bump superagent from 7.1.1 to 7.1.2 ( #13917 )
...
Bumps [superagent](https://github.com/visionmedia/superagent ) from 7.1.1 to 7.1.2.
- [Release notes](https://github.com/visionmedia/superagent/releases )
- [Changelog](https://github.com/visionmedia/superagent/blob/master/HISTORY.md )
- [Commits](https://github.com/visionmedia/superagent/commits )
---
updated-dependencies:
- dependency-name: superagent
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-04 10:56:57 -04:00
34d0922bcc
Merge remote-tracking branch 'rarysson/update-year-on-footer' into develop
2022-04-01 16:28:04 -05:00
55cf2f9795
Improve flows for social auth users ( #13862 )
...
* Multiple fixes for social authentication flows
* frontend changes
* add missing computed property
* Improvements to social flows
* fix existing email error
* minor fixes
* fix space
* fix test
* fix lint
Co-authored-by: SabreCat <sabe@habitica.com >
2022-03-31 16:43:16 -05:00
9ff0766910
Fix cron not running if previous run failed ( #13892 )
...
* catch issue where cron wouldn’t run bc previous run failed
* add some more tests for cron middleware
* fix lint
2022-03-31 16:32:59 -05:00
06d982401a
Update: Revised text string for zodiacZookeeper and birdsOfAFeather achievements ( #13884 )
...
* updated text string for zodiacZooKeeper and birdsOfAFeather
* added peacock and rooster (oops!)
2022-03-31 15:59:36 -05:00
140372a70d
Update faceAvatar.vue so snowman ACTUALLY shows up ( #13911 )
2022-03-31 15:39:53 -05:00
48be0a38bf
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-31 14:49:35 -05:00
bd9754221b
Merge branch 'origin/develop' into Weblate.
2022-03-31 21:48:15 +02:00
d58ca4c998
Merge branch 'release' into develop
2022-03-31 14:47:44 -05:00
7c53f9fd21
4.226.1
2022-03-31 14:47:22 -05:00
ae6918d52e
chore(event): canonical duration
2022-03-31 14:41:59 -05:00
d367060a82
Translated using Weblate (Japanese)
...
Currently translated at 98.6% (2543 of 2579 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (197 of 197 strings)
Translated using Weblate (French)
Currently translated at 100.0% (197 of 197 strings)
Translated using Weblate (French)
Currently translated at 100.0% (2579 of 2579 strings)
Translated using Weblate (French)
Currently translated at 100.0% (131 of 131 strings)
Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net >
Co-authored-by: Weblate <noreply@weblate.org >
Co-authored-by: mattya 226 <worldworld1114@gmail.com >
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translation: Habitica/Achievements
Translation: Habitica/Gear
Translation: Habitica/Subscriber
2022-03-31 19:36:03 +02:00
8e7ec46c8f
Merge branch 'HabitRPG:develop' into develop
2022-03-31 11:58:23 -04:00
d0d32c0b58
fix: Spring Fling Strings ( #13902 )
...
* fix: spring fling string fixes
* fix: additional spring fling string fixes
2022-03-30 16:46:35 -05:00
1dd3bc188e
Merge branch 'HabitRPG:develop' into develop
2022-03-30 17:04:21 -04:00
459b327e2d
feat(nav): clicking "Group" goes to first group
2022-03-30 15:53:48 -05:00
608ae5fc43
feat(event): April Fooly 2022
2022-03-30 15:31:17 -05:00
d3fde93762
fix(cron): don't adjust task decay by "assignments" for open Daily
2022-03-30 13:06:50 -05:00
aa81c330af
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-30 11:35:33 -05:00
391fa541ef
Merge branch 'origin/develop' into Weblate.
2022-03-30 16:47:45 +02:00
bc87e8b400
Merge branch 'release' into develop
2022-03-30 09:46:11 -05:00
5c4b8ce58b
4.226.0
2022-03-30 09:45:06 -05:00
2b93ea3740
chore(sprites): compile
2022-03-30 09:44:36 -05:00
61956ea720
Merge remote-tracking branch 'CuriousMagpie/2022-04-subscriber-items' into release
2022-03-30 09:17:52 -05:00
976e8cf242
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (206 of 206 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (219 of 219 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (22 of 22 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Spanish)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (German)
Currently translated at 100.0% (206 of 206 strings)
Co-authored-by: Mara Dolichotis <marascherzer@gmail.com >
Co-authored-by: Pardinus <artemisadlg@gmail.com >
Co-authored-by: Sara López <sarayupy@gmail.com >
Co-authored-by: Weblate <noreply@weblate.org >
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/es/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/es/
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/es/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/de/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/es/
Translation: Habitica/Achievements
Translation: Habitica/Limited
Translation: Habitica/Loginincentives
Translation: Habitica/Settings
2022-03-30 12:18:52 +02:00
2c566cb9e3
Merge branch 'HabitRPG:develop' into develop
2022-03-29 16:26:27 -04:00
89d7f94fc3
habitica-images
2022-03-29 16:21:38 -04:00
7a15bfc140
Merge branch 'HabitRPG:develop' into develop
2022-03-29 16:12:11 -04:00
265dfbbb98
2022-04 Subscriber Items
2022-03-29 16:08:25 -04:00
7283d112f4
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-29 14:10:18 -05:00
59bd135e44
Merge branch 'origin/develop' into Weblate.
2022-03-29 21:08:20 +02:00
cf04d9d0be
Merge branch 'release' into develop
2022-03-29 14:07:57 -05:00
d16bb83721
4.225.4
2022-03-29 14:07:42 -05:00
93ae36d139
fix(event): add underscore for mobile handling of NPCs
2022-03-29 14:04:37 -05:00
0783ccae24
2022 Spring Fling Potions
2022-03-29 13:54:07 -05:00
f918b4a68c
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (German)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (French)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (French)
Currently translated at 100.0% (219 of 219 strings)
Translated using Weblate (French)
Currently translated at 99.9% (2572 of 2573 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (219 of 219 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (746 of 746 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 99.2% (130 of 131 strings)
Translated using Weblate (German)
Currently translated at 100.0% (2573 of 2573 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (219 of 219 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (219 of 219 strings)
Translated using Weblate (Ukrainian)
Currently translated at 84.4% (185 of 219 strings)
Translated using Weblate (German)
Currently translated at 100.0% (219 of 219 strings)
Translated using Weblate (German)
Currently translated at 99.9% (2572 of 2573 strings)
Translated using Weblate (Ukrainian)
Currently translated at 72.1% (158 of 219 strings)
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (365 of 365 strings)
Translated using Weblate (Ukrainian)
Currently translated at 96.0% (171 of 178 strings)
Translated using Weblate (Ukrainian)
Currently translated at 84.9% (634 of 746 strings)
Translated using Weblate (German)
Currently translated at 99.5% (218 of 219 strings)
Translated using Weblate (Ukrainian)
Currently translated at 79.5% (2048 of 2573 strings)
Translated using Weblate (German)
Currently translated at 99.6% (2565 of 2573 strings)
Translated using Weblate (Ukrainian)
Currently translated at 84.9% (634 of 746 strings)
Translated using Weblate (Ukrainian)
Currently translated at 84.9% (634 of 746 strings)
Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net >
Co-authored-by: Mara Dolichotis <marascherzer@gmail.com >
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com >
Co-authored-by: Sciuridae <sweetvshoney@163.com >
Co-authored-by: Weblate <noreply@weblate.org >
Co-authored-by: mattya 226 <worldworld1114@gmail.com >
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/de/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/de/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/uk/
Translation: Habitica/Achievements
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Questscontent
2022-03-29 19:41:35 +02:00
4070dd7754
Merge branch 'HabitRPG:develop' into develop
2022-03-29 13:15:39 -04:00
d44b2fe785
Minor fixes ( #13909 )
...
Updated "resetText2", "transaction_rebirth", and "transaction_reroll" to correct capitalization and eliminate a double space.
2022-03-29 12:30:16 -04:00
f1b0aa2e7c
Merge branch 'develop' into sabrecat/teams-rebase
2022-03-28 16:34:31 -05:00
SabreCat