 Phillip Thelen
|
6887fd70c0
|
try something
|
2023-02-28 16:17:52 +01:00 |
|
|
Phillip Thelen
|
def24142ca
|
remove wrong test
|
2023-02-27 13:30:44 +01:00 |
|
|
Phillip Thelen
|
c29049146d
|
prevent sub accidentally also being applied to other account
|
2023-02-27 12:06:27 +01:00 |
|
|
Phillip Thelen
|
57fb7ca6f2
|
fix
|
2023-02-24 11:25:53 +01:00 |
|
|
Phillip Thelen
|
be18476292
|
correctly set perkMonthCount
|
2023-02-23 13:20:47 +01:00 |
|
|
Phillip Thelen
|
3f56b7fa3f
|
fix offset calculation
|
2023-02-17 15:42:31 +01:00 |
|
|
Phillip Thelen
|
d69de2948b
|
fix import
|
2023-02-16 09:58:09 +01:00 |
|
|
Phillip Thelen
|
e338fb8ce7
|
Merge branch 'apple_sub_fix' of https://github.com/HabitRPG/habitica into apple_sub_fix
|
2023-02-16 09:37:36 +01:00 |
|
|
Phillip Thelen
|
2d5dcae406
|
fix tests
|
2023-02-16 09:37:00 +01:00 |
|
|
Phillip Thelen
|
3203b09b7a
|
reset perkMonthCount when subscription ends
|
2023-02-15 10:05:18 +01:00 |
|
|
Phillip Thelen
|
6ee2e3a379
|
Merge remote-tracking branch 'origin/develop' into apple_sub_fix
|
2023-02-13 17:38:14 +01: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
|
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
|
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 |
|
|
Phillip Thelen
|
0dd25b6431
|
fix issue where subs would be applied multiple times
|
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 |
|
|
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
|
a213fb723a
|
fix(purchases): correct hardcoded date range for Gryph
|
2023-02-03 09:23:21 -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 |
|
|
SabreCat
|
e1deb6adff
|
fix(payments): add missing SKU variations
|
2023-01-22 23:21:22 -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 |
|
|
SabreCat
|
e5bbde7e97
|
feat(event): 10th Birthday Bash
with @CuriousMagpie and @phillipthelen
|
2023-01-20 16:14:33 -06:00 |
|
|
SabreCat
|
98c4910051
|
Merge branch 'release' into develop
|
2022-12-23 15:35:20 -06:00 |
|
|
SabreCat
|
079279e5c1
|
Revert "fix(tests): if singleton event, always provide empty string suffix"
This reverts commit 64bf4ee4b6.
|
2022-12-20 09:51:24 -06:00 |
|
|
SabreCat
|
6d33ec02a8
|
Merge branch 'release' into develop
|
2022-12-19 16:24:48 -06:00 |
|
|
SabreCat
|
64bf4ee4b6
|
fix(tests): if singleton event, always provide empty string suffix
|
2022-12-19 16:22:20 -06:00 |
|
|
Adam Fitzgibbon
|
42e0bad4ac
|
added validation for blocked users when inviting to groups by username (#14316)
|
2022-12-15 14:47:54 -06:00 |
|
|
Phillip Thelen
|
b97da5fe57
|
Add support for getting chat limit from database (#14392)
* Add support for getting chat limit from database
* fix lint error
|
2022-12-15 14:38:28 -06:00 |
|
|
Phillip Thelen
|
21652c2670
|
fix tests and some cases
|
2022-12-02 17:12:17 +01:00 |
|
|
Phillip Thelen
|
d1ee679810
|
handle upgrades and creations better
|
2022-12-02 11:51:33 +01:00 |
|
|
SabreCat
|
67988da33c
|
fix(lint): line lengths and so on
|
2022-11-30 15:27:53 -06:00 |
|
|
Phillip Thelen
|
fae26a517d
|
Improve handling
|
2022-11-30 15:06:50 +01:00 |
|
|
SabreCat
|
f1fa6a8456
|
Revert "Allow sub upgrades/downgrades on iOS (#14303)"
This reverts commit 9e98e56e9b.
|
2022-11-21 16:40:56 -06:00 |
|