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,701 Commits 64 Branches 1,226 Tags
75c36e6622e91d7f965e0af9dd71cb15b29b7234
Commit Graph

1477 Commits

Author SHA1 Message Date
SabreCat
5893312d75 Merge branch 'develop' into sabrecat/teams-rebase 2022-08-17 14:28:43 -05:00
SabreCat
b82239811c chore(content): add items to featured 2022-08-15 15:28:47 -05:00
Natalie L
f0b5637e9e chore(content): add Porcelain Magic Hatching Potion (#14168) 
* chore(submodule): add August 2022 Mystery Items

* chore: update habitica-images

* chore(content): add Porcelain Magic Hatching Potion

* chore(content): update moonglow potion availability

* fix(events): no gap between events

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-08-15 15:14:23 -05:00
SabreCat
1701fc702b Merge branch 'develop' into sabrecat/teams-rebase 2022-08-09 11:55:46 -05:00
Natalie L
0528ee1761 fix(dates): update end dates for quest bundle (#14167) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): add Woodland Wizard achievement

* chore(content): add Forest Friends quest bundle

* fix(typo): whitespace

* fix(dates): update end date for quest bundle

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-08-09 11:50:05 -05:00
SabreCat
3654e01fee Merge branch 'develop' into sabrecat/teams-rebase 2022-08-08 12:13:29 -05:00
SabreCat
79071e3445 Merge branch 'develop' into release 2022-08-04 16:18:58 -05:00
Natalie L
f7b727dc95 chore(content): add Woodland Wizard Achievement and Forest Friends Quest Bundle (#14159) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): add Woodland Wizard achievement

* chore(content): add Forest Friends quest bundle

* fix(typo): whitespace

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-08-04 15:14:27 -05:00
SabreCat
a78aea5456 Merge branch 'release' into develop 2022-08-02 10:10:00 -05:00
SabreCat
1c3d4a6fd5 Revert "Revert "chore(content): add August 2022 Backgrounds and Enchanted Armoire Items (#14149)"" 
This reverts commit 9a2b49b4bf.
 2022-08-02 10:09:02 -05:00
SabreCat
a418752041 Merge branch 'develop' into sabrecat/teams-rebase 2022-08-01 15:40:08 -05:00
Natalie L
e2c6fb1ea2 chore(content): add August 2022 Backgrounds and Enchanted Armoire Items (#14149) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): August 2022 Backgrounds and Enchanted Armoire Items

* chore(submodule): August 2022 Backgrounds and Enchanted Armoire images

* fix(typo): space

* fix(whitespace): spaces

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-07-29 16:51:56 -05:00
SabreCat
9a2b49b4bf Revert "chore(content): add August 2022 Backgrounds and Enchanted Armoire Items (#14149)" 
This reverts commit 2748455f16.
 2022-07-29 16:25:14 -05:00
SabreCat
750a02053c feat(content): August 2022 subscriber items 
Code by @CuriousMagpie
 2022-07-29 16:24:32 -05:00
Natalie L
2748455f16 chore(content): add August 2022 Backgrounds and Enchanted Armoire Items (#14149) 
* chore(submodule): add August 2022 Mystery Items

* chore(content): August 2022 Backgrounds and Enchanted Armoire Items

* chore(submodule): August 2022 Backgrounds and Enchanted Armoire images

* fix(typo): space

* fix(whitespace): spaces

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
 2022-07-29 16:21:20 -05:00
SabreCat
30d3892fb4 Merge branch 'develop' into sabrecat/teams-rebase 2022-07-25 15:04:43 -05:00
Nishant Jain
8070486def add max length validations for summary in challenge create and update… (#14053) 
* add max length validations for summary in challenge create and update controllers

* Add validation to group APIs

* fix lint errors

* add validation to group plan

* fix imports

* add tests

* add max length validations for summary in challenge create and update controllers

* Add validation to group APIs

* fix lint errors

* add validation to group plan

* fix imports

* add tests

* lint checks
 2022-07-22 15:24:24 -05:00
SabreCat
153561dd42 Merge branch 'develop' into sabrecat/teams-rebase 2022-07-18 15:50:20 -05:00
Vi Mio
3b1407f529 feat: prevent user from purchasing a quest if prerequisites are not met (#14073) 
* feat: prevent user from purchasing a quest if prerequisites are not met

* test: fail to buy quest if not all prerequisites are met

* test: modify to check all quest prerequisites
 2022-07-14 15:24:52 -05:00
SabreCat
9a879d566e fix(content): correct availability range for Seafoam 2022-07-12 10:05:02 -05:00
Natalie L
0d444a9d6a chore(content): prebuild July Enchanted Armoire and Backgrounds (#14108) 2022-07-06 14:30:40 -05:00
SabreCat
9453b1269e Merge branch 'develop' into sabrecat/teams-rebase 2022-07-05 14:34:53 -05:00
Natalie L
0e458683fd chore(content): add splashySkins for Summer Gala event (#14107) 
* chore(content): add splashySkins for Summer Gala event

* fix(content): use date string, not Boolean, for range start

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-07-05 14:33:50 -05:00
SabreCat
6ebfa976fe Merge branch 'develop' into sabrecat/teams-rebase 2022-06-29 14:30:25 -05:00
Natalie L
dcced2debb chore(content): July 2022 Mystery Items (#14095) 
* merge upstream/release into release

* chore(content): Added July 2022 Mystery Items
 2022-06-29 14:02:46 -05:00
SabreCat
b790b87ca8 Merge branch 'develop' into sabrecat/teams-rebase 2022-06-21 09:34:17 -05:00
Natalie L
f0c25dab05 2022 Summer Gala Content (#14067) 
* merge upstream/release into origin/release

* Revert "merge upstream/release into origin/release"

This reverts commit 902ed08cc3.

* Summer Splash 2022 Content

* added magic hatching potions

* updated events for testing

* fix whitespace

* various corrections

* fix(gear): mage set, healer set, event start date

* update: habitica-images

* fix(events): include normal/empty season data outside of gala

* fix(string): missing attribute and event verbiage for warrior item

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-06-21 09:29:53 -05:00
SabreCat
8b084e627e WIP(teams): show open tasks on user view 2022-06-16 13:25:09 -05:00
SabreCat
4ac1a3e717 Merge branch 'develop' into sabrecat/teams-rebase 2022-06-14 14:46:50 -05:00
SabreCat
0f8ed2c06a Merge branch 'release' into develop 2022-06-14 14:38:29 -05:00
SabreCat
285fcbd71f fix(content): add event field for countdown 2022-06-14 14:34:25 -05:00
CuriousMagpie
36d82a1d39 June 2022 Pet Quest Bundle 2022-06-14 14:33:53 -05:00
SabreCat
a0177fa44d WIP(teams): display assigned tasks on user's personal board 2022-06-13 16:53:29 -05:00
sau226
4d10c53216 Further transition from HTTP to HTTPS (#14039) 2022-06-10 14:02:58 -05:00
SabreCat
9fec111c4d Merge branch 'develop' into sabrecat/teams-rebase 2022-06-06 15:15:16 -05:00
Natalie L
2d1bf74858 June 2022 Backgrounds and Enchanted Armoire (#14049) 2022-06-06 14:55:38 -05:00
Natalie L
d726b88a86 Content: Beta Groups Testing Achievement (#14014) 
* content: beta Groups testing achievement

* resolving merge conflict
 2022-06-03 15:04:27 -05:00
SabreCat
c98c7ab26c Merge branch 'develop' into sabrecat/teams-rebase 2022-05-31 15:51:16 -05:00
Natalie L
dd5066ab72 2022-06 Subscriber Items (#14016) 
* 2022-06 Subscriber Items

* chore(mystery): compile sprites, tidy up whitespace

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-30 15:56:50 -05:00
SabreCat
1ef7924ba5 Merge branch 'develop' into sabrecat/teams-rebase 2022-05-24 09:39:01 -05:00
SabreCat
8358da227d fix(quests): hide offseason quests, again 
Also tidy up some Reptacular Rumble issues
 2022-05-23 15:38:16 -05:00
CuriousMagpie
5fa705c390 code for reptacular rumble achievement 2022-05-23 14:58:17 -05:00
SabreCat
7651e6a540 Merge branch 'develop' into sabrecat/teams-rebase 2022-05-19 14:30:29 -05:00
SabreCat
e7f60cb68f fix(achievements): TigerCub not Tiger, sigh 2022-05-18 14:43:10 -05:00
SabreCat
9c24d43a13 Merge branch 'develop' into sabrecat/teams-rebase 2022-05-17 09:34:51 -05:00
SabreCat
c0e22377d1 Merge branch 'release' into develop 2022-05-17 09:33:45 -05:00
Natalie L
4e78d72cee May 2022 Magic Hatching Potions and Quest Bundle (#13979) 
* May 2022 magic hatching potions and quest bundle

* fix(string): typo

* fix(content): add and use event

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-17 09:32:50 -05:00
Megan Searles
5bc544c481 for locking items in market, special overrides available set. fixes #13798 (#13817) 
* for locking items, special overrides available

* fix(market): allow purchase of broken item

Co-authored-by: Megan Shepherd <meg.d.shep@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-13 16:11:49 -05:00
SabreCat
1a74d2b3b0 refactor(achievements): crush down to much fewer notification types 
most work by @CuriousMagpie
 2022-05-12 15:25:40 -05:00
Sabe Jones
a0de2dab49 fix(tasks): don't send delta around as an array (#13967) 
Co-authored-by: SabreCat <sabe@habitica.com>
 2022-05-12 14:56:05 -05:00