Alice Harris ab66f95c8e Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 ...

Conflicts:
	dist/habitrpg-shared.js

2015-01-06 15:26:59 +10:00

..

backgrounds.json

Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12

2015-01-06 15:26:59 +10:00

challenge.json

Added notification to challenge prize pop, for issue #2094, until gems get refunded on challenge cancelation.

2014-08-08 02:47:25 +04:00

character.json

fix(i18n): remove duplicate strings cc @negue

2015-01-02 12:45:40 +01:00

communityGuidelines.json

Corrected wording

2014-12-25 15:21:29 +01:00

content.json

fix(quest): Dapper to perspicacious

2014-12-09 20:56:38 -06:00

contrib.json

tavern-tier-rewards-update(en)

2014-11-20 15:33:33 -08:00

defaultTasks.json

Edited capitalization for consistency

2014-10-09 20:39:35 -05:00

front.json

The language file for the Forgot Password fix

2014-10-14 01:33:14 -07:00

gear_README.md

update formatting for gear style guidelines

2014-12-23 06:43:05 +10:00

gear.json

Merge branch 'yearUpdate' of https://github.com/thehindenburg/habitrpg-shared into thehindenburg-yearUpdate

2015-01-01 15:37:55 -06:00

generic.json

Add dateFormat phrase for translation

2014-12-26 15:48:20 -05:00

groups.json

Brought in groups.json from original branch

2014-12-18 22:01:52 -06:00

limited.json

Merge pull request #425 from SabreCat/nye

2014-12-30 22:17:23 -06:00

messages.json

add correct message for equipping equipment

2014-05-18 10:45:24 +10:00

npc.json

Corrected grammar to use a ; in stead of a ,

2014-12-30 06:44:10 -06:00

pets.json

release pets feature

2014-09-29 15:11:24 -07:00

quests.json

add text and improve existing text for cancelling/aborting quests and for reporting on various situations in which quest owner is no longer in quest or in party

2014-09-08 18:49:05 +10:00

questsContent.json

Merge pull request #412 from lacrimae/develop

2014-12-26 06:47:14 +10:00

rebirth.json

level 100 modal strings and removing level cap

2014-05-11 07:53:31 -07:00

settings.json

fix(i18n): remove duplicate strings cc @negue

2015-01-02 12:45:40 +01:00

spells.json

Accidentally a dash

2014-12-13 00:15:46 +01:00

subscriber.json

Fix #4296 (Subscription "Update Card" message is cut off)

2014-12-24 00:06:17 +01:00

tasks.json

rename Habit tabs to make them shorter (Weak/Strong instead of Struggling/On Track) - https://github.com/HabitRPG/habitrpg/pull/4167#issuecomment-61394775

2014-11-09 09:09:38 +10:00