Blade Barringer 316c3e9c2e Sort out conflicts from develop

2015-07-12 13:51:42 -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

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

communityGuidelines.json

Patched translation fixes and added a few phrases to locales.

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

content.json

feat(event): Derby Day pet quest

2015-07-09 12:57:43 -05:00

contrib.json

feat(surveys): Close out survey

2015-03-19 21:44:42 -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(events): Limited edition

2015-06-25 11:19:01 -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

Add locale strings

2015-07-11 15:05:32 -05:00

npc.json

WIP(event): Summer Splash cont'd

2015-07-08 16:13:23 -05:00

pets.json

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

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

quests.json

WIP(event): Summer Splash cont'd

2015-07-08 16:13:23 -05:00

questsContent.json

feat(event): Derby Day pet quest

2015-07-09 12:57:43 -05:00

rebirth.json

Removed 'freeRebirth' modal and its associated strings

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

settings.json

Adjust login modal

2015-07-02 07:58:11 -05: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