krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,220 Commits 62 Branches 1,225 Tags
12479edb776eb1e108bcb31766f9a589d108ef95
Commit Graph

24220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Thelen
12479edb77 fix tests and some cases 2023-02-06 11:17:35 +01:00
Phillip Thelen
c0c6657536 handle upgrades and creations better 2023-02-06 11:17:35 +01:00
SabreCat
e81a052f66 fix(lint): line lengths and so on 2023-02-06 11:17:35 +01:00
Phillip Thelen
82a1d6ff0e Improve handling 2023-02-06 11:17:35 +01:00
Phillip Thelen
0f7001b609 fix lint 2023-02-06 11:17:35 +01:00
Phillip Thelen
87558a325e Handle subscription cancelation better 2023-02-06 11:17:35 +01:00
Phillip Thelen
de48925341 remove only 2023-02-06 11:17:35 +01:00
Phillip Thelen
614850e56c fix tests 2023-02-06 11:17:35 +01:00
Phillip Thelen
64a3515c10 Add logic for different types of sub upgrades 2023-02-06 11:17:35 +01:00
Phillip Thelen
8dfa21a4b8 Add field to track when current subscription type started 2023-02-06 11:17:35 +01:00
Phillip Thelen
f9a9d4919b Improve recheck handling for test subs 2023-02-06 11:17:35 +01:00
Phillip Thelen
ddf1b4060d Better handling for cancellation when user had multiple subs 2023-02-06 11:17:35 +01:00
Phillip Thelen
967717a010 Fix logic for apple subscriptions 2023-02-06 11:17:35 +01:00
SabreCat
9b791b4ba0 fix(test): save user to avoid lock errors 2023-02-06 11:17:35 +01:00
SabreCat
5aca5b4be7 fix(test): linting 2023-02-06 11:17:35 +01:00
Phillip Thelen
0dd25b6431 fix issue where subs would be applied multiple times 2023-02-06 11:17:35 +01:00
Phillip Thelen
cf75d941fa fix test 2023-02-06 11:17:35 +01:00
Phillip Thelen
777f7887b4 fix lint errors 2023-02-06 11:17:35 +01:00
Phillip Thelen
f07d0f6441 Implement correct handling for when subs are up/downgraded 2023-02-06 11:17:24 +01:00
Phillip Thelen
98ec1757f9 fix tests 2023-02-06 11:16:24 +01:00
SabreCat
742da1f2c6 fix(typo): customER 2023-02-06 11:16:24 +01:00
SabreCat
b3d5a8d083 fix(lint): line length 2023-02-06 11:16:24 +01:00
Phillip Thelen
b5f2e66025 fix check 2023-02-06 11:16:24 +01:00
Phillip Thelen
9a40674d8d Allow sub upgrades/downgrades on iOS 2023-02-06 11:16:24 +01:00
SabreCat
0f9b6ab591 fix(lint): revert bad lint rule again 2023-01-31 11:00:08 -06:00
SabreCat
4d953890c3 Merge branch 'release' into develop 2023-01-31 10:56:23 -06:00
SabreCat
dd6897ac53 Merge branch 'sabrecat/admin-panel-gems' into release 2023-01-31 10:53:11 -06:00
SabreCat
a19b5356b5 Merge branch 'sabrecat/admin-panel-gems' into develop 2023-01-31 10:53:03 -06:00
SabreCat
b59fcd203b Merge branch 'sabrecat/fixes-202302' into release 2023-01-31 10:51:41 -06:00
SabreCat
0ca339829f 4.258.0 v4.258.0 2023-01-31 10:35:50 -06:00
Natalie L
059269f9b0 chore(content): add February subscriber items (#14466) 
* chore(content): add February subscriber items

* fix(strings): month typo

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-01-31 10:33:36 -06:00
SabreCat
5eda99b0b8 Merge branch 'release' into develop 2023-01-31 10:02:54 -06:00
Natalie L
cfa85850bf chore(typos): miscellaneous string fixes (#14414) 
* fix(string): questVice1Notes html changed to a mobile-device friendly format

* fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order

* fix(string): remove extra word from headSpecialSummer2022WarriorNotes

* fix(string): corrected armorSpecialSummer2022MageNotes

* fix: remove duplicated string and adjust upgrade button style

* fix(style): set border radii to 8px on upgrading-group id

* fix(payments): remove duplicate entry from another modal

* chore(fix): restore string inadvertently removed during a refactor

* chore(fix): comma dangle

* chore(typo): who knew, that Y was actually important...

* chore(typo): fix text in questBewilderNotes

* chore(string): clarify polar pets requirements

* couple small changes to the footer as pointed out by users

* chore(fix): correct name of Fabulous Party Hat

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-01-31 10:03:06 -06:00
SabreCat
dd9e03044f chore(subproject): update habitica-images 2023-01-31 10:02:43 -06:00
SabreCat
27964a2d86 fix(analytics): add headers to group task assignment 2023-01-27 19:57:15 -06:00
SabreCat
ecac3f0c5f fix(backgrounds): disallow equipping unowned bashground 
Also add missing headers when recording group task creation
 2023-01-27 19:26:19 -06:00
Weblate
9f64633a57 Merge branch 'origin/develop' into Weblate. 2023-01-26 22:11:34 +01:00
SabreCat
5dc4fccddc Merge branch 'release' into develop 2023-01-26 15:09:09 -06:00
SabreCat
f03c37f420 4.257.0 v4.257.0 2023-01-26 15:06:27 -06:00
SabreCat
f31103094b fix(events): don't start "no event" until after birthday10 2023-01-26 15:05:07 -06:00
Weblate
f30074ed7a Translated using Weblate (Malay) 
Currently translated at 98.6% (144 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Indonesian)

Currently translated at 87.3% (652 of 746 strings)

Translated using Weblate (Arabic)

Currently translated at 60.1% (449 of 746 strings)

Translated using Weblate (Malay)

Currently translated at 4.9% (9 of 181 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Arabic)

Currently translated at 58.4% (436 of 746 strings)

Translated using Weblate (Russian)

Currently translated at 99.4% (2735 of 2749 strings)

Translated using Weblate (Malay)

Currently translated at 96.5% (141 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Indonesian)

Currently translated at 86.5% (646 of 746 strings)

Translated using Weblate (Malay)

Currently translated at 95.2% (139 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Indonesian)

Currently translated at 86.3% (644 of 746 strings)

Translated using Weblate (Malay)

Currently translated at 93.8% (137 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 93.8% (137 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Russian)

Currently translated at 99.4% (2734 of 2749 strings)

Translated using Weblate (Indonesian)

Currently translated at 86.3% (644 of 746 strings)

Translated using Weblate (Malay)

Currently translated at 92.4% (135 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 91.0% (133 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Arabic)

Currently translated at 61.6% (1695 of 2749 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (47 of 47 strings)

Translated using Weblate (Portuguese)

Currently translated at 92.0% (197 of 214 strings)

Translated using Weblate (Malay)

Currently translated at 89.0% (130 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 87.6% (128 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2749 of 2749 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 86.9% (127 of 146 strings)

Translated using Weblate (Hebrew)

Currently translated at 100.0% (94 of 94 strings)

Translated using Weblate (Hebrew)

Currently translated at 69.1% (101 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 86.3% (126 of 146 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (2749 of 2749 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (2746 of 2749 strings)

Translated using Weblate (Malay)

Currently translated at 84.9% (124 of 146 strings)

Translated using Weblate (Ukrainian)

Currently translated at 24.4% (673 of 2749 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (238 of 238 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (238 of 238 strings)

Translated using Weblate (Russian)

Currently translated at 99.3% (2732 of 2749 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Malay)

Currently translated at 83.5% (122 of 146 strings)

Translated using Weblate (Ukrainian)

Currently translated at 66.3% (501 of 755 strings)

Translated using Weblate (Malay)

Currently translated at 82.1% (120 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 81.5% (119 of 146 strings)

Translated using Weblate (Japanese)

Currently translated at 99.7% (2743 of 2749 strings)

Translated using Weblate (Malay)

Currently translated at 75.3% (110 of 146 strings)

Translated using Weblate (Indonesian)

Currently translated at 86.3% (644 of 746 strings)

Translated using Weblate (Malay)

Currently translated at 73.9% (108 of 146 strings)

Translated using Weblate (Filipino)

Currently translated at 90.6% (164 of 181 strings)

Translated using Weblate (Indonesian)

Currently translated at 85.7% (640 of 746 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (210 of 210 strings)

Translated using Weblate (Japanese)

Currently translated at 99.6% (2740 of 2749 strings)

Translated using Weblate (Filipino)

Currently translated at 91.1% (165 of 181 strings)

Translated using Weblate (Filipino)

Currently translated at 91.9% (343 of 373 strings)

Translated using Weblate (Japanese)

Currently translated at 99.5% (2737 of 2749 strings)

Translated using Weblate (Filipino)

Currently translated at 40.9% (9 of 22 strings)

Translated using Weblate (Japanese)

Currently translated at 99.3% (2731 of 2749 strings)

Translated using Weblate (Japanese)

Currently translated at 99.0% (2723 of 2749 strings)

Translated using Weblate (Filipino)

Currently translated at 91.1% (165 of 181 strings)

Translated using Weblate (Japanese)

Currently translated at 98.9% (2719 of 2749 strings)

Translated using Weblate (Malay)

Currently translated at 66.4% (97 of 146 strings)

Translated using Weblate (Arabic)

Currently translated at 86.8% (53 of 61 strings)

Translated using Weblate (Japanese)

Currently translated at 98.8% (2717 of 2749 strings)

Translated using Weblate (Russian)

Currently translated at 99.1% (2727 of 2749 strings)

Translated using Weblate (Bulgarian)

Currently translated at 65.0% (95 of 146 strings)

Translated using Weblate (Russian)

Currently translated at 99.0% (2724 of 2749 strings)

Translated using Weblate (Indonesian)

Currently translated at 82.6% (105 of 127 strings)

Translated using Weblate (Japanese)

Currently translated at 98.6% (2711 of 2749 strings)

Translated using Weblate (Japanese)

Currently translated at 98.5% (2710 of 2749 strings)

Translated using Weblate (Japanese)

Currently translated at 98.5% (2709 of 2749 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (238 of 238 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (214 of 214 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (60 of 60 strings)

Translated using Weblate (Ukrainian)

Currently translated at 61.7% (466 of 755 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (210 of 210 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (111 of 111 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (404 of 404 strings)

Translated using Weblate (Malay)

Currently translated at 65.7% (96 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 64.3% (94 of 146 strings)

Translated using Weblate (Russian)

Currently translated at 99.0% (2722 of 2749 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Russian)

Currently translated at 98.8% (2717 of 2749 strings)

Translated using Weblate (Malay)

Currently translated at 60.9% (89 of 146 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (210 of 210 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Malay)

Currently translated at 47.9% (70 of 146 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (238 of 238 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2749 of 2749 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (60 of 60 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 99.5% (2738 of 2749 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (186 of 186 strings)

Translated using Weblate (French)

Currently translated at 100.0% (238 of 238 strings)

Translated using Weblate (French)

Currently translated at 100.0% (2749 of 2749 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (186 of 186 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (238 of 238 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (2749 of 2749 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (181 of 181 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (146 of 146 strings)

Translated using Weblate (Russian)

Currently translated at 99.5% (237 of 238 strings)

Translated using Weblate (Russian)

Currently translated at 98.5% (2709 of 2749 strings)

Translated using Weblate (Malay)

Currently translated at 38.3% (56 of 146 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (221 of 221 strings)

Translated using Weblate (Malay)

Currently translated at 55.2% (116 of 210 strings)

Translated using Weblate (Malay)

Currently translated at 21.9% (32 of 146 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (238 of 238 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2749 of 2749 strings)

Translated using Weblate (Indonesian)

Currently translated at 95.9% (212 of 221 strings)

Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Arthur Ouzlaner <panther1984@gmail.com>
Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net>
Co-authored-by: Falzart Werefox <muh_fauzi_ramadhan@yahoo.co.id>
Co-authored-by: Hanafi <naflizo@gmail.com>
Co-authored-by: Keva Kursakov <kevakursakov@gmail.com>
Co-authored-by: LiziKnight <liziknight0316@outlook.com>
Co-authored-by: M <maperray@gmail.com>
Co-authored-by: Natalie Luhrs <eilatan@gmail.com>
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com>
Co-authored-by: Salman Mujeeb <kingleopard22@gmail.com>
Co-authored-by: Sandra Marcial <sandramarcial80@gmail.com>
Co-authored-by: Sergey Shevelev <vlkgamer45@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Co-authored-by: polyglottericus <vincemorel.vilan.889@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/bg/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/he/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ms/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/ar/
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/backgrounds/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/character/id/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/id/
Translate-URL: https://translate.habitica.com/projects/habitica/content/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/id/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/front/ms/
Translate-URL: https://translate.habitica.com/projects/habitica/front/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/it/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/it/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ru/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/fil/
Translate-URL: https://translate.habitica.com/projects/habitica/messages/ar/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/quests/he/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/id/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/it/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ms/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Character
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Loginincentives
Translation: Habitica/Messages
Translation: Habitica/Pets
Translation: Habitica/Quests
Translation: Habitica/Questscontent
Translation: Habitica/Settings
Translation: Habitica/Subscriber
 2023-01-26 20:39:15 +01:00
SabreCat
9aa8b6d64d fix(shops): use gala-specific logic for gala gear canBuy 2023-01-25 12:45:55 -06:00
SabreCat
ce96f4065d fix(event): adjust potions end date 2023-01-25 11:08:35 -06:00
SabreCat
def9aa16b5 fix(events): handle overlap of unseasonal events and seasonal 2023-01-25 10:51:47 -06:00
SabreCat
efae9429c0 feat(event): adjust dates, add NPC variations 2023-01-24 16:11:16 -06:00
SabreCat
ac239e32ce fix(payments): wrap up adjusted test expectations 2023-01-23 00:45:31 -06:00
SabreCat
e1deb6adff fix(payments): add missing SKU variations 2023-01-22 23:21:22 -06:00
SabreCat
3474cbf138 fix(payments): correct more tests 2023-01-22 23:02:18 -06:00
SabreCat
f845bbd7a0 fix(payments): address some test failures 2023-01-22 22:30:48 -06:00
SabreCat
0dfc8de300 fix(lint): remove extraneous import 2023-01-20 16:25:24 -06:00