Sabe Jones 9eb70ee9ba Merge branch 'develop' into release

2018-02-09 00:58:13 +00:00

..

appearance

feat(content): backgrounds and Armoire Feb 2018

2018-02-02 00:31:38 +00:00

gear

Added two handed message to weapons (#9839)

2018-02-02 11:21:53 -07:00

achievements.js

Lost Masterclasser Quest Line (#9183)

2017-10-13 20:32:55 -05:00

constants.js

(in)definite articles for food items. Partial fix for https://github.com/HabitRPG/habitica/issues/3571 (#9658)

2018-02-05 19:43:12 +01:00

eggs.js

feat(content): Badger Pet Quest

2018-02-07 02:03:30 +00:00

faq.js

Remove email addresses from translatable strings (#8448)

2017-03-29 03:55:11 +00:00

hatching-potions.js

feat(content): enable Cupid Potions

2018-02-09 00:35:51 +00:00

index.js

fix(food): add missing text functions to Bare Bones Cake

2018-02-06 20:34:33 +00:00

loginIncentives.js

Tasks scoring and misc fixes (#8925)

2017-08-04 23:27:11 +02:00

mystery-sets.js

feat(content): Mystery Items 2018/01

2018-01-23 22:38:23 +00:00

officialPinnedItems.js

[WIP] new client - seasonal-shop (#9018)

2017-09-20 19:28:11 -05:00

quests.js

feat(content): Badger Pet Quest

2018-02-07 02:03:30 +00:00

shop-featuredItems.js

feat(content): backgrounds and Armoire Feb 2018

2018-02-02 00:31:38 +00:00

spells.js

Notifications v2 and Bailey API (#9716)

2018-01-31 11:55:39 +01:00

stable.js

feat(event): Habitoween

2017-10-30 20:40:29 +00:00

subscriptionBlocks.js

Merge branch 'stripe-webhook' into develop

2017-03-29 03:55:47 +00:00

time-travelers.js

Upgrade lodash to v4 and lint more files (#8495)

2017-03-01 17:10:48 +01:00

translation.js

Common reorg (#8025)

2016-09-16 17:18:07 +02:00