Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal ...

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png

2015-07-24 16:11:51 -05:00

..

backgrounds.json

feat(event): Summer Splash cont'd

2015-07-01 13:11:53 -05:00

challenge.json

Moved clone tasks function to task service

2015-06-17 22:22:55 -05:00

character.json

Merge branch 'develop' into refactor_member_modal_and_stats_page

2015-07-18 17:10:04 -05:00

communityGuidelines.json

Patched translation fixes and added a few phrases to locales.

2015-05-03 23:41:42 +05:30

content.json

change message on Armoire when it is empty to say that new gear arrives in the first week of the month

2015-07-16 12:56:28 +10:00

contrib.json

adding more links to heroes blurb and links not included in json

2015-07-14 07:44:51 -05:00

death.json

fix(death): Gentler wording

2015-07-23 17:08:00 -05:00

defaultTasks.json

fix(i18n): remove unused, empty string that was breaking Transifex

2015-06-23 10:38:30 +02:00

front.json

Made text on static/contact translatable

2015-05-24 13:31:29 +05:00

gear_README.md

Moved folders into common directory

2015-01-21 10:34:04 -06:00

gear.json

feat(mystery): July 2015 goodies

2015-07-23 12:05:13 -05:00

generic.json

rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section

2015-06-29 21:49:54 +10:00

groups.json

change white "Report" button to red "Report Violation" button in chat message flag modal

2015-07-11 21:23:39 +10:00

limited.json

feat(event): Summer Splash cont'd

2015-07-01 13:11:53 -05:00

messages.json

feat(mystery): July 2015 goodies

2015-07-23 12:05:13 -05:00

npc.json

fix(i18n): string for amazon payments

2015-07-17 15:28:55 +02:00

pets.json

Merge branch 'develop' into equipment-refactor-merge-into-develop

2015-07-11 15:55:53 -05:00

quests.json

feat(quests): Improve drop notif

2015-07-16 16:22:49 -05:00

questsContent.json

feat(quests): Dilatory Distress

2015-07-13 18:21:32 -05:00

rebirth.json

Removed 'freeRebirth' modal and its associated strings

2015-06-13 14:18:03 -04:00

settings.json

fix(settings): use correct value for inactivity emails

2015-07-15 00:13:17 +02:00

spells.json

feat(event): Summer Splash cont'd

2015-07-01 13:11:53 -05:00

subscriber.json

Fix a missing comma

2015-05-06 14:09:22 +01:00

tasks.json

add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines)

2015-06-28 14:41:02 +10:00