ad6555c92b
fix import
2023-02-06 17:16:43 +01:00
c04e8ea514
comma
2023-02-06 13:01:06 +01:00
aec2409227
lint fixes
2023-02-06 12:59:54 +01:00
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
a3bc20f855
Fix case where a number was sometimes a string
2023-02-06 11:17:35 +01:00
86e33b2364
remove log
2023-02-06 11:17:35 +01:00
12479edb77
fix tests and some cases
2023-02-06 11:17:35 +01:00
c0c6657536
handle upgrades and creations better
2023-02-06 11:17:35 +01:00
e81a052f66
fix(lint): line lengths and so on
2023-02-06 11:17:35 +01:00
82a1d6ff0e
Improve handling
2023-02-06 11:17:35 +01:00
0f7001b609
fix lint
2023-02-06 11:17:35 +01:00
87558a325e
Handle subscription cancelation better
2023-02-06 11:17:35 +01:00
de48925341
remove only
2023-02-06 11:17:35 +01:00
614850e56c
fix tests
2023-02-06 11:17:35 +01:00
64a3515c10
Add logic for different types of sub upgrades
2023-02-06 11:17:35 +01:00
8dfa21a4b8
Add field to track when current subscription type started
2023-02-06 11:17:35 +01:00
f9a9d4919b
Improve recheck handling for test subs
2023-02-06 11:17:35 +01:00
ddf1b4060d
Better handling for cancellation when user had multiple subs
2023-02-06 11:17:35 +01:00
967717a010
Fix logic for apple subscriptions
2023-02-06 11:17:35 +01:00
9b791b4ba0
fix(test): save user to avoid lock errors
2023-02-06 11:17:35 +01:00
5aca5b4be7
fix(test): linting
2023-02-06 11:17:35 +01:00
0dd25b6431
fix issue where subs would be applied multiple times
2023-02-06 11:17:35 +01:00
cf75d941fa
fix test
2023-02-06 11:17:35 +01:00
777f7887b4
fix lint errors
2023-02-06 11:17:35 +01:00
f07d0f6441
Implement correct handling for when subs are up/downgraded
2023-02-06 11:17:24 +01:00
98ec1757f9
fix tests
2023-02-06 11:16:24 +01:00
742da1f2c6
fix(typo): customER
2023-02-06 11:16:24 +01:00
b3d5a8d083
fix(lint): line length
2023-02-06 11:16:24 +01:00
b5f2e66025
fix check
2023-02-06 11:16:24 +01:00
9a40674d8d
Allow sub upgrades/downgrades on iOS
2023-02-06 11:16:24 +01:00
c7deb1eb19
4.258.2
2023-02-03 09:23:27 -06:00
a213fb723a
fix(purchases): correct hardcoded date range for Gryph
2023-02-03 09:23:21 -06:00
5f66aa35f2
4.258.1
2023-02-02 16:36:44 -06:00
96a8c1a41c
fix(chat): correctly hide flag counts from non-moderators
2023-02-02 16:36:37 -06:00
0f9b6ab591
fix(lint): revert bad lint rule again
2023-01-31 11:00:08 -06:00
3470382528
fix(lint): revert bad lint rule again
2023-01-31 10:59:53 -06:00
4d953890c3
Merge branch 'release' into develop
2023-01-31 10:56:23 -06:00
dd6897ac53
Merge branch 'sabrecat/admin-panel-gems' into release
2023-01-31 10:53:11 -06:00
a19b5356b5
Merge branch 'sabrecat/admin-panel-gems' into develop
2023-01-31 10:53:03 -06:00
b59fcd203b
Merge branch 'sabrecat/fixes-202302' into release
2023-01-31 10:51:41 -06:00
0ca339829f
4.258.0
2023-01-31 10:35:50 -06:00
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
5eda99b0b8
Merge branch 'release' into develop
2023-01-31 10:02:54 -06:00
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
dd9e03044f
chore(subproject): update habitica-images
2023-01-31 10:02:43 -06:00
27964a2d86
fix(analytics): add headers to group task assignment
2023-01-27 19:57:15 -06:00
ecac3f0c5f
fix(backgrounds): disallow equipping unowned bashground
...
Also add missing headers when recording group task creation
2023-01-27 19:26:19 -06:00
9f64633a57
Merge branch 'origin/develop' into Weblate.
2023-01-26 22:11:34 +01:00
5dc4fccddc
Merge branch 'release' into develop
2023-01-26 15:09:09 -06:00
f03c37f420
4.257.0
2023-01-26 15:06:27 -06:00
Phillip Thelen