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

24592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Thelen
58f4dd0c43 fix typo 2023-02-10 17:13:04 +01:00
Phillip Thelen
0ce64a0197 fix next hourglass calculation 2023-02-09 16:20:46 +01:00
Natalie L
0b8f2bc58e update(content): revise community guidelines (#14481) 
* update(content); revise community guidelines

* fix(CG): remove outdated spoiler advice, remove unneeded string token

* chore(CG): update date line to intended publication

---------

Co-authored-by: SabreCat <sabe@habitica.com>
 2023-02-08 15:04:30 -06:00
SabreCat
015631685b 4.259.1 v4.259.1 2023-02-08 15:04:19 -06:00
CuriousMagpie
20df5eeb8f buy modal complete! 2023-02-08 15:16:17 -05:00
CuriousMagpie
23f7dd94b6 more stylin' of the buy modal 2023-02-07 15:24:53 -05:00
CuriousMagpie
7125da4533 Merge branch 'develop' into increment-component 2023-02-07 14:05:48 -05:00
SabreCat
6c536c0b89 Merge branch 'release' into develop 2023-02-07 09:12:03 -06:00
SabreCat
1de2adf301 4.259.0 v4.259.0 2023-02-07 09:11:52 -06:00
Natalie L
0335eb1f7e chore(content): add February backgrounds and Enchanted Armoire Items (#14482) 
* chore(content): add February backgrounds and Enchanted Armoire Items

* fix(test): birthday week adjustment

* fix(strings): .

* fix(strings): correct background tokens

---------

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2023-02-07 09:12:19 -06:00
SabreCat
e0a5938711 fix(test): update expectations for new flagging logic 2023-02-06 21:34:51 -06:00
CuriousMagpie
684cb59a7c buyModal styling/functions 2023-02-06 16:23:20 -05:00
CuriousMagpie
9274fe9a10 Merge branch 'develop' into increment-component 2023-02-06 14:30:34 -05:00
Phillip Thelen
ad6555c92b fix import 2023-02-06 17:16:43 +01:00
Phillip Thelen
c04e8ea514 comma 2023-02-06 13:01:06 +01:00
Phillip Thelen
aec2409227 lint fixes 2023-02-06 12:59:54 +01:00
Phillip Thelen
87aebcc19e Merge branch 'apple_sub_fix' of https://github.com/HabitRPG/habitica into apple_sub_fix 
# Conflicts:
#	test/api/unit/libs/payments/apple.test.js
#	website/server/libs/payments/subscriptions.js
 2023-02-06 11:19:00 +01:00
Phillip Thelen
a3bc20f855 Fix case where a number was sometimes a string 2023-02-06 11:17:35 +01:00
Phillip Thelen
86e33b2364 remove log 2023-02-06 11:17:35 +01:00
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
c7deb1eb19 4.258.2 v4.258.2 2023-02-03 09:23:27 -06:00
SabreCat
a213fb723a fix(purchases): correct hardcoded date range for Gryph 2023-02-03 09:23:21 -06:00
SabreCat
5f66aa35f2 4.258.1 v4.258.1 2023-02-02 16:36:44 -06:00
SabreCat
96a8c1a41c fix(chat): correctly hide flag counts from non-moderators 2023-02-02 16:36:37 -06:00
SabreCat
0f9b6ab591 fix(lint): revert bad lint rule again 2023-01-31 11:00:08 -06:00
SabreCat
3470382528 fix(lint): revert bad lint rule again 2023-01-31 10:59:53 -06:00
SabreCat
4d953890c3 Merge branch 'release' into develop 2023-01-31 10:56:23 -06:00