krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,698 Commits 64 Branches 1,226 Tags
e9b2c1b51a37c726480aa6fb07d4759559660ae2
Commit Graph

2370 Commits

Author SHA1 Message Date
SabreCat
df25e0574d fix(auth): enforce max pass length at update 2022-12-05 16:36:42 -06:00
Phillip Thelen
8b2af1ef56 remove log 2022-12-05 15:38:30 +01: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
a8e9c9bc70 chore(event): set up Harvest Feast 2022 2022-11-21 18:54:57 -06:00
SabreCat
f1fa6a8456 Revert "Allow sub upgrades/downgrades on iOS (#14303)" 
This reverts commit 9e98e56e9b.
 2022-11-21 16:40:56 -06:00
Sabe Jones
82c5e40b92 Enforce maximum password length (#14290) 
* fix(auth): enforce maximum password length

* fix(auth): line length and better error message

* fix(auth): correctly import/export constant

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-11-18 16:49:10 -06:00
Natalie L
116068effa fix(apiDescription): remove incorrect information (#14367) 2022-11-18 16:21:03 -06:00
SabreCat
f2aaee15f3 Merge branch 'release' into develop 2022-11-18 15:29:06 -06:00
SabreCat
15353eba8a fix(subs): roll all the way back, didn't work :( 2022-11-18 15:12:14 -06:00
SabreCat
febffb3f07 Revert "Fix double subscriptions, second attempt (#14345)" 
This reverts commit 1a5cba57b7.
 2022-11-18 14:26:49 -06:00
SabreCat
fdfa2d6df4 Merge branch 'release' into develop 2022-11-15 19:29:37 -06:00
SabreCat
259131ee3f feat(transactions): UI updates 
by @negue
 2022-11-15 19:28:36 -06:00
Sabe Jones
1a5cba57b7 Fix double subscriptions, second attempt (#14345) 
* fix(subscriptions): reject subs that come in too fast

* fix(lint): remove unused import

* fix(groups): individual subs may come rapidly

* fix(subscriptions): bad paren, handle rapid testing

* fix(test): reset dateUpdated between subs

* fix(test): one more block for dateUpdated

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-11-15 19:19:37 -06:00
Phillip Thelen
e3c86349b4 fix lint 2022-11-11 13:58:45 +01:00
Phillip Thelen
6604f38144 Handle subscription cancelation better 2022-11-11 13:54:17 +01:00
Phillip Thelen
7d2529f5e1 Add logic for different types of sub upgrades 2022-11-09 19:49:53 +01:00
SabreCat
6ee06f76e4 chore(i18n): update locale files 
Also includes two fixes: empty Hourglass transaction logging and missing Recovery + Support guild category
 2022-11-08 10:17:40 -06:00
Phillip Thelen
8d732c59c4 Add field to track when current subscription type started 2022-11-08 12:38:24 +01:00
Phillip Thelen
3a34aa4cc5 Improve recheck handling for test subs 2022-11-08 12:19:17 +01:00
Phillip Thelen
e7fc7feddd Better handling for cancellation when user had multiple subs 2022-11-04 13:30:50 +01:00
Phillip Thelen
7fd899b642 Fix logic for apple subscriptions 2022-11-03 17:48:36 +01:00
SabreCat
164dbdcf10 Merge branch 'develop' into apple_sub_fix 2022-11-02 15:00:24 -05:00
SabreCat
f6e5360bdd Merge branch 'release' into develop 2022-11-02 14:54:09 -05:00
Phillip Thelen
ab953440e3 fix issue where subs would be applied multiple times 2022-11-02 16:36:09 +01:00
SabreCat
9b1a726875 Revert "feat(subs): allow upgrade/downgrade on iOS" 
This reverts commit 27440772f0.
 2022-11-02 09:00:29 -05:00
Phillip Thelen
9e98e56e9b Allow sub upgrades/downgrades on iOS (#14303) 
* Allow sub upgrades/downgrades on iOS

* fix check

* fix(lint): line length

* fix(typo): customER

* fix tests

* Implement correct handling for when subs are up/downgraded

* fix lint errors

* fix test

Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-11-01 21:07:23 -05:00
SabreCat
27440772f0 feat(subs): allow upgrade/downgrade on iOS 
by @phillipthelen
 2022-11-01 20:53:04 -05:00
SabreCat
aea0be3245 fix(subs): establish lock to prevent race condition 2022-11-01 20:47:21 -05:00
Natalie L
3bc82a6692 chore(content): add Bone to Pick achievement (#14318) 
* chore(content): add Bone to Pick achievement

* chore(content): update spritesmith-main.css

* chore(content): add more bone picking

* chore(content): more bone picking

* chore(content): bone picking

* chore(content): i gotta bone to pick here

* chore(content): final bone picking

* chore: add migration script

* chore: update habitica-images

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-10-31 14:19:56 -05:00
Phillip Thelen
08469c556b fix lint errors 2022-10-28 12:41:43 +02:00
Phillip Thelen
13a25ad89e Implement correct handling for when subs are up/downgraded 2022-10-28 11:23:48 +02:00
negue
f7a03d2eb5 improve transactions logs + split createSubscription (#14289) 
* improve transactions logs + split createSubscription
 2022-10-27 08:39:06 +02:00
SabreCat
e6a7d15644 fix(typo): customER 2022-10-25 16:59:59 -05:00
SabreCat
6a4b08203f fix(lint): line length 2022-10-25 16:52:16 -05:00
SabreCat
c9016c8d42 Merge branch 'develop' into phillip/sub_change 2022-10-25 16:47:51 -05:00
Sabe Jones
90250d1a25 Establish lock to avoid race scenario in subscriptions (#14267) 
* fix(subscription): establish lock to avoid race scenario

* fix(lint): import syntax

* fix(lint): whitespace, dependency cycle

* fix(subs): skip locking on gifts and groups

* fix(subs): correctly reset _subSignature

* fix(sub): use findOneAndUpdate for unlock

* fix(test): save newly created user for some reason

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-10-25 16:44:33 -05:00
Phillip Thelen
31685c3e94 fix check 2022-10-21 16:59:18 +02:00
Phillip Thelen
c25b09c7ed Allow sub upgrades/downgrades on iOS 2022-10-21 16:57:12 +02:00
Anton de Regt
a4326498d1 Group category update issue (#14186) 
* Overwrite arrays instead of merging

* Test removing a category

* Fix previous duplicated categories on group edit
 2022-10-12 15:51:56 -05:00
Adam Tommasi
137f7d53dc add qty param for gem/gem-purchasable item apidoc (#14219) 
* add qty param for gem/gem-purchasable item

* fix(lint): remove extra whitespace

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-10-07 16:33:38 -05:00
SabreCat
8cd9536bdc Merge branch 'develop' into release 2022-09-30 15:25:27 -05:00
SabreCat
57d3fea523 Merge branch 'group-tracking-modal' into release 2022-09-30 14:47:08 -05:00
SabreCat
7db093d2bb Merge branch 'sabrecat/panel-subscription' into release 2022-09-30 14:46:10 -05:00
SabreCat
eea79ce1b6 Merge branch 'develop' into sabrecat/gems-multi-event 2022-09-21 16:03:57 -05:00
negue
e9ee2d3fdd Transaction username mongodb mutation (#14231) 
* migrate newest usernames in transactions

* fix lint

* change the parameters
 2022-09-21 14:42:39 -05:00
SabreCat
004f1ee2dc Merge branch 'develop' into sabrecat/panel-subscription 2022-09-20 15:11:29 -05:00
CuriousMagpie
719fab8d4b chore: merge develop in 2022-09-16 16:12:34 -04:00