45dedbbdaa
fix(banners): correct dismiss/show behavior
2023-06-07 15:00:51 -05:00
0185a1fbd6
Merge branch 'develop' into sabrecat/chat-warning
2023-06-06 09:22:23 -05:00
df22f5f7bf
Merge branch 'develop' into release
2023-06-06 09:21:25 -05:00
bb28bb5969
feat(content): add June backgrounds and Enchanted Armoire items ( #14684 )
...
* feat(content): add June subscriber items
* feat(content): add July backgrounds and Enchanted Armoire items
* feat(fix): correct sizing for aquarium background
* fix(strings): JSON formatting
* fix(sprites): add missing broad variant
---------
Co-authored-by: SabreCat <sabe@habitica.com >
2023-06-06 09:17:22 -05:00
3b6c39dc9b
fix(banner): restore close X on pause
2023-06-06 08:57:10 -05:00
e4e8e0ff60
Translated using Weblate (Malay)
...
Currently translated at 51.8% (55 of 106 strings)
Translated using Weblate (Japanese)
Currently translated at 96.8% (214 of 221 strings)
Translated using Weblate (Malay)
Currently translated at 50.9% (54 of 106 strings)
Translated using Weblate (Indonesian)
Currently translated at 81.1% (340 of 419 strings)
Translated using Weblate (Portuguese)
Currently translated at 60.1% (163 of 271 strings)
Translated using Weblate (Indonesian)
Currently translated at 83.3% (637 of 764 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (152 of 152 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (135 of 135 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (8 of 8 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (182 of 182 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (186 of 186 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (13 of 13 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (419 of 419 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (106 of 106 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (271 of 271 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (218 of 218 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (132 of 132 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (61 of 61 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (122 of 122 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (220 of 220 strings)
Translated using Weblate (Belarusian)
Currently translated at 71.3% (157 of 220 strings)
Translated using Weblate (Japanese)
Currently translated at 95.9% (212 of 221 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (112 of 112 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (132 of 132 strings)
Translated using Weblate (Japanese)
Currently translated at 97.4% (264 of 271 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (271 of 271 strings)
Translated using Weblate (Japanese)
Currently translated at 96.4% (404 of 419 strings)
Translated using Weblate (Indonesian)
Currently translated at 80.6% (338 of 419 strings)
Translated using Weblate (Japanese)
Currently translated at 99.8% (2828 of 2831 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (182 of 182 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (106 of 106 strings)
Translated using Weblate (Indonesian)
Currently translated at 83.3% (637 of 764 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (122 of 122 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (376 of 376 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (784 of 784 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (220 of 220 strings)
Translated using Weblate (Japanese)
Currently translated at 94.1% (208 of 221 strings)
Translated using Weblate (Indonesian)
Currently translated at 91.8% (249 of 271 strings)
Translated using Weblate (Indonesian)
Currently translated at 79.4% (333 of 419 strings)
Translated using Weblate (Indonesian)
Currently translated at 60.6% (1718 of 2831 strings)
Translated using Weblate (Japanese)
Currently translated at 78.3% (83 of 106 strings)
Translated using Weblate (Indonesian)
Currently translated at 83.3% (637 of 764 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (122 of 122 strings)
Translated using Weblate (Japanese)
Currently translated at 100.0% (152 of 152 strings)
Translated using Weblate (French)
Currently translated at 100.0% (152 of 152 strings)
Translated using Weblate (Indonesian)
Currently translated at 83.3% (637 of 764 strings)
Translated using Weblate (Galician)
Currently translated at 60.2% (1706 of 2831 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (271 of 271 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (221 of 221 strings)
Translated using Weblate (Indonesian)
Currently translated at 78.5% (213 of 271 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 54.7% (58 of 106 strings)
Translated using Weblate (Indonesian)
Currently translated at 83.3% (637 of 764 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (152 of 152 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (152 of 152 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (419 of 419 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (106 of 106 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (218 of 218 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (132 of 132 strings)
Translated using Weblate (Galician)
Currently translated at 100.0% (220 of 220 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (221 of 221 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (94 of 94 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (13 of 13 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (112 of 112 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (132 of 132 strings)
Translated using Weblate (Indonesian)
Currently translated at 63.4% (172 of 271 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (8 of 8 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (218 of 218 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (182 of 182 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (106 of 106 strings)
Translated using Weblate (Indonesian)
Currently translated at 83.3% (637 of 764 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (122 of 122 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (376 of 376 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (186 of 186 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (784 of 784 strings)
Translated using Weblate (Indonesian)
Currently translated at 100.0% (152 of 152 strings)
Co-authored-by: Adrián Chaves Fernández <adrian@chaves.io >
Co-authored-by: Falzart <muh_fauzi_ramadhan@yahoo.co.id >
Co-authored-by: Hanafi <naflizo@gmail.com >
Co-authored-by: Hanna Aniskevich <northernwind@tut.by >
Co-authored-by: LiziKnight <liziknight0316@outlook.com >
Co-authored-by: Sara Olson <sara@habitica.com >
Co-authored-by: TOMA Mitsuru <toma0001@gmail.com >
Co-authored-by: Weblate <noreply@weblate.org >
Co-authored-by: Yatharth <megacutiemauandtuchchu@gmail.com >
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/id/
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/backgrounds/id/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/character/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/character/id/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/id/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/content/id/
Translate-URL: https://translate.habitica.com/projects/habitica/content/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/id/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/ms/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/front/id/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/id/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/id/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/id/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/inventory/id/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/id/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/messages/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/id/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/overview/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/id/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/quests/id/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/id/
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/id/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/be/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/spells/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/gl/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/id/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/gl/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Character
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Inventory
Translation: Habitica/Limited
Translation: Habitica/Messages
Translation: Habitica/Npc
Translation: Habitica/Overview
Translation: Habitica/Pets
Translation: Habitica/Quests
Translation: Habitica/Questscontent
Translation: Habitica/Rebirth
Translation: Habitica/Settings
Translation: Habitica/Spells
Translation: Habitica/Subscriber
Translation: Habitica/Tasks
2023-06-06 05:00:15 +02:00
84e5c00be1
WIP(announcement): correct layout and close X
2023-06-05 16:16:19 -05:00
187029f44f
Merge remote-tracking branch 'private/natalie/antisocial' into sabrecat/chat-warning
2023-06-05 15:54:41 -05:00
efbc7d1460
WIP(faq): sidebar formatting
2023-06-05 16:53:48 -04:00
36f84d083e
Merge remote-tracking branch 'private/natalie/antisocial' into sabrecat/chat-warning
2023-06-05 15:32:46 -05:00
2154ba5451
WIP(fix): change URL
2023-06-05 12:33:40 -04:00
cf0e45c68c
Merge branch 'natalie/antisocial' into sabrecat/chat-warning
2023-06-02 16:14:20 -05:00
93d9038765
WIP(faq): initial formatting of main text, started on sidebar
2023-06-02 17:00:13 -04:00
302eabb30f
WIP(faq): hack background to white
2023-06-02 14:58:16 -05:00
09695f637e
Merge branch 'release' into natalie/antisocial
2023-06-02 14:12:52 -05:00
e9a15fcb83
fix(strings): JSON formatting
2023-06-02 13:55:04 -05:00
97c8138340
feat(content): minor updates
2023-06-02 11:31:43 -04:00
a65b0d1f4d
fix(banner): make dismissable
2023-06-01 16:33:11 -05:00
c0cf647873
fix(banner): only show when relevant
2023-05-31 16:55:21 -05:00
d20e976176
feat(style): css work
2023-05-31 14:27:52 -04:00
739016ba01
WIP(chat): add warning banner
2023-05-30 16:25:29 -05:00
867eed176e
feat(content): add June subscriber items ( #14669 )
...
Co-authored-by: SabreCat <sabe@habitica.com >
2023-05-30 15:26:16 -05:00
deba7b6220
feat(faq): update for mobile workflows
2023-05-30 14:50:13 -05:00
55d6ee3f7e
feat(content): add staff and tiers
2023-05-30 12:01:21 -04:00
17072dcc45
Merge branch 'due-dates-in-todos' into release
2023-05-25 14:42:46 -05:00
2448f401f2
Merge branch 'increment-component' into release
2023-05-25 14:42:42 -05:00
9ef13dad68
feat(content): starting add styling, string updates
2023-05-25 12:25:08 -04:00
14fa69719b
feat(content): static page created and strings in place
2023-05-24 16:18:31 -04:00
d4a5823916
Fix one-off issue for monthly subs ( #14643 )
...
* Fix initial plan.consecutive.offset for 1 month subs
* fix initial values for group plan subs
* Make perkMonthCount editable in admin panel
* Add aditional info to admin panel
* Implement automatic fix for affected users
* fix(lint): exclusive test, code style
* fixes
* fix issue with initialization
---------
Co-authored-by: SabreCat <sabe@habitica.com >
2023-05-24 13:29:42 -05:00
929b0196a4
add strings
2023-05-24 13:24:44 -04:00
1b91f620e1
initial commit
2023-05-23 16:01:40 -04:00
86b15cb580
fix(style): css fix, today if-statement added
2023-05-23 15:19:26 -04:00
102c71c4ca
Merge remote-tracking branch 'CuriousMagpie/2023-05-pet-quest-bundle' into release
2023-05-22 15:14:18 -05:00
a7bde80349
Squashed commit of the following:
...
commit 27287ac3aaeilatan@gmail.com >
Date: Mon May 22 15:59:20 2023 -0400
fix(typo): typos fixed
commit a4df8097cfeilatan@gmail.com >
Date: Mon May 22 15:57:17 2023 -0400
feat(content): add migration script
commit 23ff7845c1d02644e21b8ba7117fa5eilatan@gmail.com >
Date: Mon May 22 15:42:32 2023 -0400
Merge branch 'develop' into achievement-dinosaur-dynasty
commit 8ba7117fa5#14662 )
Bumps [stripe](https://github.com/stripe/stripe-node ) from 12.5.0 to 12.6.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/v12.5.0...v12.6.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>
commit fe5d4a0551#14661 )
Bumps [sinon](https://github.com/sinonjs/sinon ) from 15.0.4 to 15.1.0.
- [Release notes](https://github.com/sinonjs/sinon/releases )
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md )
- [Commits](https://github.com/sinonjs/sinon/compare/v15.0.4...v15.1.0 )
---
updated-dependencies:
- dependency-name: sinon
dependency-type: direct:development
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>
commit d02644e21beilatan@gmail.com >
Date: Wed May 17 11:36:28 2023 -0400
feat(content): add dinosaur dynasty achievement
2023-05-22 15:13:49 -05:00
deebc09a79
fix(analytics): typo
2023-05-22 09:54:10 -05:00
b63f2fa1fa
fix(analytics): add missing headers to 3 events
2023-05-19 14:54:30 -05:00
60b180681e
Merge remote-tracking branch 'origin/due-dates-in-todos' into due-dates-in-todos
2023-05-17 13:30:45 -04:00
7c1c18a329
fix(styling): update colors to be a11y-friendly and to show items due today in gray
2023-05-17 13:29:26 -04:00
0b0cbb45f4
feat(content): add May pet quest bundle
2023-05-17 10:49:37 -04:00
0e03f079a7
Merge branch 'due-dates-in-todos' of https://github.com/CuriousMagpie/habitica into due-dates-in-todos
2023-05-16 14:27:56 -05:00
a71e44b331
fix(test): remove test for old function
2023-05-16 14:27:15 -05:00
48917fd8be
Merge branch 'develop' into due-dates-in-todos
2023-05-16 14:18:22 -05:00
2a054a25ee
fix(test): include user pref needed for date
2023-05-16 14:15:34 -05:00
8150fef993
Database Access optimisations ( #14544 )
...
* Optimize database access during spell casting
* load less data when casting spells
* Begin migrating update calls to updateOne and updateMany
* Only update user objects that don’t have notification yet
* fix test
* fix spy
* Don’t unnecessarily update user when requesting invalid guild
* fix sort order for middlewares to not load user twice every request
* fix tests
* fix integration test
* fix skill usage not always deducting mp
* addtest case for blessing spell
* fix healAll
* fix lint
* Fix error for when some spells are used outside of party
* Add check to not run bulk spells in web client
* fix(tags): change const to let
---------
Co-authored-by: SabreCat <sabe@habitica.com >
2023-05-16 12:21:45 -05:00
0518b90eab
Merge branch 'develop' into release
2023-05-15 16:11:30 -05:00
f968bdd3a9
fix(analytics): re-enable group chat tracking
2023-05-15 16:02:24 -05:00
e3a1ea6180
save task column filter ( #14587 )
...
* save task column filter
* remove old setting
* fix tests
2023-05-15 16:01:32 -05:00
17f6054ef0
feat(content): add May magic hatching potions ( #14641 )
2023-05-15 15:59:49 -05:00
9b8f213c63
build(deps): bump jquery from 3.6.4 to 3.7.0 in /website/client ( #14653 )
...
Bumps [jquery](https://github.com/jquery/jquery ) from 3.6.4 to 3.7.0.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.6.4...3.7.0 )
---
updated-dependencies:
- dependency-name: jquery
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>
2023-05-15 13:46:41 -04:00
daccade2e2
disabled sell button when user tries to sell more items than they own
2023-05-15 12:03:58 -04:00
SabreCat