Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,691 Commits 64 Branches 1,256 Tags
0053dd67bde09e1b7c8b61a8efa2f7fe4d07d7b4
Commit Graph

566 Commits

Author SHA1 Message Date
Blade Barringer 0053dd67bd Adjusted translation key text, added a new one for releasing both. Added 
releaseBoth function
 2015-01-02 13:20:58 -06:00
Blade Barringer fb25848035 Adjusted text to match beastmasterProgress 2015-01-01 17:05:20 -06:00
Blade Barringer e613edbe3a Adjusted text to be more accurate 2015-01-01 16:53:09 -06:00
Blade Barringer c0f51379e7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-01 16:25:56 -06:00
Blade Barringer 38a5dca58e Merge branch 'yearUpdate' of https://github.com/thehindenburg/habitrpg-shared into thehindenburg-yearUpdate 2015-01-01 15:37:55 -06:00
thehindenburg 74a871a8d2 add two years to winter gear 2014-12-31 17:46:06 -08:00
Blade Barringer a5a7d22ce4 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2014-12-31 13:17:21 -06:00
Matteo Pagliazzi c3283483e3 chore(i18n): update locales 2014-12-31 13:35:49 +01:00
Sabe Jones 8fabcc4ffd Merge pull request #425 from SabreCat/nye 
New Year's event features
 2014-12-30 22:17:23 -06:00
Sabe Jones dd3ec20e5e feat(NYE): Silly Party Hat 2014-12-30 21:20:07 -06:00
Sabe Jones 7a16c644c3 fix(NYE): I18N for random text 2014-12-30 20:51:40 -06:00
Sabe Jones 5623fb0078 fix(NYE): I18N shop text 2014-12-30 20:14:56 -06:00
Blade Barringer 23de3eeff8 Corrected grammar to use a ; in stead of a , 2014-12-30 06:44:10 -06:00
Blade Barringer 3b5a2f925e Removed unused translation string 2014-12-30 06:36:29 -06:00
Sabe Jones 9e74d94e48 WIP(NYE): New Year's Cards 2014-12-29 20:57:12 -06:00
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
thehindenburg 0dfa770fe4 update winter 2013 to winter 2014 to satisfy new naming conventions 2014-12-22 21:13:59 -08: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