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
22,507 Commits 63 Branches 1,225 Tags
1a57f7df00e4651cb58ae9b62057b5bb43cbfaf1
Commit Graph

913 Commits

Author SHA1 Message Date
Sabe Jones
bb9912de89 fix(analytics): problems 2020-03-30 15:38:41 -05:00
Sabe Jones
6e8bdf4cdf Merge branch 'release' into develop 2020-03-24 13:14:15 -05:00
Sabe Jones
3e96e54ad8 feat(event): eggy eggy 2020-03-24 13:13:50 -05:00
Denys Dorokhov
25e72ad907 Reward with negative cost can no longer be created, fixes #11855 (#11870) 
* Minor refactoring in scoreTask.js

* Reward value validation added (should be >= 0)
 2020-03-24 12:10:10 +01:00
Sabe Jones
3ec95ad821 fix(event): feature something from 2020 2020-03-19 08:11:30 -05:00
Sabe Jones
e4b74bc347 fix(content): feature shinies 2020-03-18 11:15:49 -05:00
Sabe Jones
353b4aed05 feat(content): Magic Hatching Potions 2020-03-17 15:35:38 -05:00
Sabe Jones
5a5a6e4c5d feat(content): Spring Fling 2020 2020-03-17 14:48:49 -05:00
Sabe Jones
92c3a640ee feat(content): Bug Bonanza achievement 2020-03-17 09:11:41 -05:00
Sabe Jones
39bb60638f feat(content): Pi Day 2020 2020-03-13 10:59:52 -05:00
Sabe Jones
86951916e8 feat(content): enable bug hugging 2020-03-10 14:25:30 -05:00
Sabe Jones
bd8e67a2ea Adventure Guide Prep (#11883) 
* WIP(adventure): prereqs

* WIP(drops): new modal

* WIP(adventure): analytics fixes etc

* feat(adventure): random egg+potion on 2nd task

* fix(lint): noworkies

* fix(modal): correctly construct classes

* fix(tests): expectations and escape

* fix(first-drops): address comments

* fix(first-drops): don't give random drops until first drops

* fix(drops): remove more Level 3 references

* refactor(drops): no need for cloning

* refactor(drops): unnecessary export

* fix(first-drops): force sync

* fix(first-drops): move to server

* fix(first-drops): escape in case we get here with >0 items

* fix(lint): line length

* fix(pet-food): remove unused string
 2020-03-07 13:03:13 -06:00
Matteo Pagliazzi
2ff9dfe965 Fix username links resulting in truncated chat messages (#11945) 
* introduce MAX_MESSAGE_LENGTH constant

* add test

* fix path

* fix and tests

* fix typo in tests
 2020-03-04 11:49:14 +01:00
Sabe Jones
3fe307f6ea Merge branch 'release' into develop 2020-03-03 16:15:52 -06:00
Matteo Pagliazzi
1efc030544 Merge branch 'fix_addlNotes' of https://github.com/MynahMarie/habitica into MynahMarie-fix_addlNotes 2020-03-02 22:38:58 +01:00
Alec Brickner
966bcf8010 Ensure first-time purchases are synced (#11915) 
* Ensure first-time purchases are synced

* whitespace commit to trigger tests

* Undo whitespace commit

* more whitespace

* remove the whitespace
 2020-03-02 21:34:23 +01:00
Sabe Jones
6763e178d4 feat(content): armoire and Bee Gees 2020-03-02 07:32:53 -06:00
Sabe Jones
f47ec3d85f feat(content): mystery set March 2020 2020-02-28 15:27:14 -06:00
agentx999
bad148148c Enchanted Armoire immediately updates XP stat in header (fixes #11827) (#11884) 
* sync user if Armoire gives XP

* user can level up from Armoire

* remove XP amount from Armoire XP notification
 2020-02-24 22:19:48 +01:00
Phillip Thelen
0b57c0a22d Unify behaviour for shops (#11829) 
* Change price for basilist and dustbunnies

* return correct unlockCondition for moon quests

* Fix basilist not being buyable
 2020-02-20 13:24:43 -06:00
MynahMarie
b9a3ee7f30 remove unecessary checks for addlNotes in getItemInfo.js 2020-02-18 12:42:59 +02:00
MynahMarie
ea3938a91e call t on eventAvailabitily and intergrate change from develop branch 2020-02-18 11:45:57 +02:00
MynahMarie
fdfbade493 fix merge conflict 2020-02-18 11:06:50 +02:00
Sabe Jones
69179c61b1 feat(content): Cotton Candy Pink Prizes 2020-02-17 11:37:37 -06:00
Sabe Jones
b8362af2f2 fix(content): missing potion data 2020-02-12 18:30:54 -06:00
Sabe Jones
6324ef72df feat(content): Magic Hatching Quest 2020-02-11 16:09:51 -06:00
Sabe Jones
6f7243c049 feat(event): Valentine's 2020 2020-02-07 14:16:25 -06:00
MynahMarie
301b171f55 Merge branch 'develop' into fix_addlNotes 2020-02-05 10:53:52 +02:00
Sabe Jones
b2cfeaf9bd feat(content): Armoire and Backgrounds 2020-02 2020-02-04 15:42:12 -06:00
MynahMarie
3045be3ddf ref issue #11794 - Add error check in _addlNotes field. 2020-02-02 14:56:20 +02:00
Sabe Jones
34145ed8ca fix(event): decakeify 2020-02-01 12:07:23 -06:00
Sabe Jones
e800cd9a3f chore(event): End Wonderland 2020-02-01 07:20:55 -06:00
Sabe Jones
e31de5c8f0 feat(content): Feb 2020 subscriber set 2020-01-31 06:46:56 -06:00
Sabe Jones
bc1eb62a35 feat(event): Birthday 2020 2020-01-28 15:39:05 -06:00
Sabe Jones
ee9eb3f78a Merge branch 'release' into sabrecat/timetrav-bgs 2020-01-21 14:58:51 -06:00
Sabe Jones
0fd3e42fb2 fix(timetrav): pinning, mobile order 2020-01-16 10:06:36 -06:00
Matteo Pagliazzi
e4ba2bfc7e Merge pull request #11637 from Xaz16/trigger-vue-reactivity-for-user 
Trigger vue reactivity for user
 2020-01-14 13:00:07 +01:00
Sabe Jones
f47ccfdb6d chore(event): enable winter customizations 2020-01-10 15:32:36 -06:00
Sabe Jones
0f4a5ebe6c Merge branch 'release' into sabrecat/timetrav-bgs 2020-01-09 09:59:09 -06:00
Sabe Jones
fe9af263dd Merge branch 'release' into develop 2020-01-07 11:48:09 -06:00
Sabe Jones
25809e5c00 feat(content): Armoire, BGs 2020-01-07 11:43:14 -06:00
Sabe Jones
a550e32fd3 fix(bgs): include TT required field 2020-01-06 11:45:18 -06:00
Sabe Jones
e8edc9669a WIP(timetrav): buy BG with Hourglass 2020-01-03 12:50:13 -06:00
Sabe Jones
44bb304119 Merge branch 'release' into develop 2020-01-01 14:45:55 -06:00
Sabe Jones
904dfd3d72 chore(news): Bailey 2020-01-01 14:45:18 -06:00
Sabe Jones
df72d240fd Merge branch 'release' into develop 2019-12-31 06:52:22 -06:00
Sabe Jones
25015ae8e0 fix(event): feature NYE card 2019-12-30 19:44:22 -06:00
Sabe Jones
2693d49870 feat(content): NYE 2019-20 etc 2019-12-30 15:05:45 -06:00
Xaz16
2c65b3a6a3 Fix: remove unnecessary reassigment 2019-12-29 20:58:10 +03:00
Xaz16
4b4cc61031 Fix: remove unnecessary reassignments 2019-12-26 22:47:14 +03:00