Sabe Jones e54bd8f242 Merge branch 'develop' into release

2020-07-16 14:58:25 -05:00

..

_README_FIRST.md

Fix broken link (#8051)

2016-09-22 17:24:21 +10:00

achievements.json

feat(content): new achievement and bundle

2020-05-19 14:00:25 -05:00

backgrounds.json

feat(content): armoire/bgs

2020-07-03 11:17:50 -05:00

challenge.json

Onboarding guide and initial achievements refactoring (#11536)

2019-12-16 17:20:47 +01:00

character.json

Fixed grammar, formatting and other errors in translatable strings (#12171)

2020-05-09 17:56:28 +02:00

communityGuidelines.json

chore(feedback): replace Trello links

2020-05-19 15:15:21 -05:00

content.json

Squashed commit of the following:

2020-06-18 13:16:07 -05:00

contrib.json

improve appearance and wording in Hall's Reward User form for admins (#11248)

2019-07-12 17:14:34 +02:00

death.json

changed wikia links to fandom

2019-01-24 11:21:52 +00:00

defaultTasks.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

faq.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

front.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

gear_README.md

change Attribute to Stat and upper-case Stat Points and a couple of other terms

2018-01-12 08:09:31 +10:00

gear.json

fix(content): missing strings

2020-07-07 13:50:39 -05:00

generic.json

Fixing layout issues for the private messages page (#11766)

2020-03-04 17:50:08 +01:00

groups.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

inventory.json

Adventure Guide Prep (#11883)

2020-03-07 13:03:13 -06:00

limited.json

fix(event): missing potions

2020-06-19 14:55:49 -05:00

loginIncentives.json

fix(incentives): backfill

2017-04-26 01:04:02 +00:00

maintenance.json

Remove email addresses from translatable strings (#8448)

2017-03-27 18:03:31 +02:00

merch.json

Styled merch button to have highlight (#8273)

2016-12-10 22:09:06 -06:00

messages.json

PMs rebuild (#11360)

2020-01-12 19:34:40 +01:00

noscript.json

Common reorg (#8025)

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

npc.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

overview.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

pets.json

Add Bulk Feed via query parameter (#12384)

2020-07-13 16:04:03 +02:00

quests.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

questsContent.json

feat(content): Seafoam and Amigos

2020-07-14 16:11:34 -05:00

rebirth.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

settings.json

Squashed commit of the following:

2020-06-18 13:29:30 -05:00

spells.json

Issue 12220 stealth tooltip show protected dailies (#12255)

2020-06-29 11:12:19 +02:00

subscriber.json

feat(content): July 2020 subscriber set

2020-06-29 15:15:11 -05:00

tasks.json

Merge https://github.com/HabitRPG/habitica/pull/12338 "Added the task type to the Delete alert window"

2020-06-27 19:42:24 +02:00

testing.json

Guild A/B test and Achievement (#8740)

2017-05-19 14:45:11 -05:00