Commit graph

547 commits

Author SHA1 Message Date
Matteo Pagliazzi
e93754e50b Merge pull request #414 from Verabird/dateformat
Dateformat
2014-12-29 21:23:29 +01:00
Alice Harris
ba9a10f688 Merge pull request #408 from sbreiler/develop
Fix #4296 (Subscription "Update Card" message is cut off)
2014-12-27 12:46:32 +10:00
Verabird
baa528fe7b Add dateFormat phrase for translation 2014-12-26 15:48:20 -05:00
Verabird
a3f0d4dea5 Add default values for shortdate and mediumdate formats 2014-12-26 15:48:19 -05:00
Matteo Pagliazzi
971ea8a495 chore(i18n): update locales 2014-12-26 11:33:21 +01:00
Sabe Jones
620fcd1144 Merge pull request #413 from SabreCat/seasonal
Winter Wonderland 2015 Cont'd
2014-12-25 17:48:12 -06:00
Alice Harris
5836436b7b Merge pull request #404 from Alys/develop
Style Guide for Equipment Descriptions
2014-12-26 08:26:20 +10:00
Sabe Jones
9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones
41f4ab7b8a feat(event): Implement Seasonal Shop 2014-12-25 14:58:25 -06:00
Alice Harris
6fcf6b7d05 Merge pull request #412 from lacrimae/develop
Restored missing quote
2014-12-26 06:47:14 +10:00
lacrimae
93119d7eab ... and the quote I missed :P 2014-12-25 21:41:11 +01:00
lacrimae
772994c8a0 Restored missing quote 2014-12-25 21:40:24 +01:00
Blade Barringer
aeceb70b54 Merge pull request #411 from lacrimae/develop
Corrected wording
2014-12-25 08:35:06 -06:00
lacrimae
17233ef5df Corrected wording
"may become grow more severe" -> "may grow more severe"
2014-12-25 15:21:29 +01:00
Steffen Breiler
e33101b762 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:06:17 +01:00
Alice Harris
d34b116732 update formatting for gear style guidelines 2014-12-23 06:43:05 +10:00
Alice Harris
d6354007f1 update formatting for gear style guidelines 2014-12-23 06:42:10 +10:00
Alice Harris
9d7bf26988 update formatting for gear style guidelines 2014-12-23 06:38:21 +10:00
Alice Harris
36a552b4a3 update formatting for gear style guidelines 2014-12-23 06:34:57 +10:00
Alice Harris
e30ff2eebb create style guide for gear/equipment descriptions based on ShilohT's suggestions in https://github.com/HabitRPG/habitrpg-shared/pull/372 2014-12-23 06:28:34 +10:00
Blade Barringer
6f410f59ce Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat 2014-12-22 13:28:01 -06:00
Matteo Pagliazzi
d079ebbee9 chore(i18n): update locales 2014-12-22 20:09:45 +01:00
Sabe Jones
649e207769 Merge pull request #402 from SabreCat/winter2015/hair
Wintery Hair Colors for Wonderland 2015
2014-12-21 15:16:10 -06:00
Sabe Jones
d0a97fb20f feat(event): Wintery Hair Colors
Also removes an accidental duplication of a prior hair resource.
2014-12-21 13:55:23 -06:00
Sabe Jones
8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Blade Barringer
eeff8a80d6 Brought in groups.json from original branch 2014-12-18 22:01:52 -06:00
Matteo Pagliazzi
486d8a9bbf chore(i18n): update locales 2014-12-18 22:56:34 +01:00
James Leonis
c308f6cf9f Incorrect grammar in Vice 2 quest notes
"makes it's way to Mt. Habitica" to "makes its way to Mt. Habitica"
2014-12-18 01:01:18 -08:00
Sabe Jones
6e77392e7a fix(seasonal): Leslie link 2014-12-17 18:26:52 -06:00
Sabe Jones
cbfd043b2c Merge pull request #394 from SabreCat/seasonal
Seasonal Shop Basics
2014-12-16 21:52:28 -06:00
Tyler Renelle
059f719461 Merge pull request #231 from wc8/patch-1
innText update of groups.json to call username
2014-12-16 14:16:26 -07:00
Sabe Jones
c7ee171ee4 feat(seasonal): Seasonal shop
Initial commit of resources for the Seasonal Shop feature.
2014-12-14 13:33:10 -06:00
Sabe Jones
8d042745be fix(I18N): Translate Time Travelers 2014-12-14 12:57:36 -06:00
lacrimae
ff8a508860 Streamlined "Confers no benefit" placements 2014-12-14 13:32:44 +01:00
lacrimae
a15c57c275 Accidentally a dash 2014-12-13 00:15:46 +01:00
lacrimae
63263bbf3a Spells now mention which attribute they affect
https://github.com/HabitRPG/habitrpg-shared/issues/380
2014-12-13 00:15:46 +01:00
Blade Barringer
d2e5f60dd4 Added inbox as a env.t var 2014-12-10 10:46:36 -06:00
Sabe Jones
5cd6c02e8a fix(quest): Dapper to perspicacious 2014-12-09 20:56:38 -06:00
Sabe Jones
7fd4cebbdc fix(quest): Penguin corrections
Fix missing egg item and line breaks in quest text
2014-12-09 20:44:10 -06:00
Sabe Jones
d25455fa5a feat(quest): Implement Penguin pet quest 2014-12-09 20:21:20 -06:00
Paul Klipp
3d2c7e8854 Fixed a grammar error in the Golden Knight 2 quest
Changed “Perhaps I will shall . . . “ to “Perhaps I will . . . “
2014-12-08 12:19:08 -06:00
Blade Barringer
6739ec25a3 Merge pull request #379 from andymantell/feature/linking-timetravellers-names
Link for Tyler and Vicky's names
2014-12-06 16:48:00 -06:00
Matteo Pagliazzi
17f9d4de72 fix(i18n): fix english string 2014-12-06 19:18:28 +01:00
Andy Mantell
82cea43e07 Link for Tyler and Vicky's names 2014-12-06 15:42:32 +00:00
Matteo Pagliazzi
f010bd7ad9 chore(i18n): update locales 2014-12-05 16:21:13 +01:00
Matteo Pagliazzi
198d41d5e8 fix(pr): conflicts 2014-12-05 16:06:15 +01:00
Blade Barringer
6dac81f850 Corrected strings so they only used on variable 2014-12-04 20:03:17 -06:00
Sabe Jones
6369934ca3 feat(Gems): Add strings for Market gem 2014-12-04 19:04:07 -06:00
Blade Barringer
a55fa37412 Converted strings to be able to use links 2014-12-03 22:46:41 -06:00
Blade Barringer
2e2faa6117 Moved pre-subscription time travelers title and popover to shared 2014-12-03 22:24:43 -06:00