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

1260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle df60b95b80 Merge pull request #289 from Alys/partyJoin 
change party text to to say you go to the party page to find invitations  - fixes https://github.com/HabitRPG/habitrpg/issues/3934
 2014-08-26 21:18:25 -06:00
Alice Harris 094d5b5044 change party text to make it more obvious that you go to the party page to find invitations - fixes https://github.com/HabitRPG/habitrpg/issues/3934 2014-08-27 11:32:11 +10:00
Tyler Renelle 123b7d5015 Merge pull request #284 from Verabird/develop 
edited gem hover text in response to issue #3228
 2014-08-26 14:16:26 -06:00
Alice Harris 55a9854f6c Merge pull request #286 from Alys/mysteryTextAugust 
swap Sun Crown & Sun Robes text so we aren't wearing our robes on our heads
 2014-08-26 16:31:27 +10:00
Alice Harris b4b212e64d swap Sun Crown and Sun Robes text so that we aren't wearing our robes on our heads 2014-08-26 16:13:39 +10:00
Tyler Renelle 11f3055913 feat(mystery): august mystery 2014-08-25 17:16:16 -06:00
Tyler Renelle 31bc472876 Merge pull request #282 from negue/pushTaskToTopTooltip 
Add Locale for "Push task to top"
 2014-08-25 12:22:37 -06:00
Vera Pavel 4d618306a2 edited gem hover text to indicate real money purchase in response to issue #3228 2014-08-25 11:14:36 -04:00
Alice Harris 4c8d31c759 Merge pull request #283 from Alys/questWords 
clarify quest damage wording (only quest participants not whole party)
 2014-08-25 23:40:00 +10:00
Alice Harris ac785b6bae clarify quest damage wording (only quest participants not whole party); also minor grammar fix 2014-08-25 22:54:20 +10:00
Negue 008b0fe710 Add Locale for "Push task to top" 2014-08-24 14:39:04 +02:00
Tyler Renelle a55738b06f Merge branch 'Fandekasp-sortable_tags' into develop 2014-08-19 15:02:06 -06:00
Tyler Renelle 5e19663b71 fix(i18n): es_419 bug, use english translation for now (@paglias is this ok?) 2014-08-19 12:39:23 -06:00
Tyler Renelle ae1c075f8a refactor(spritesmith): move potions, eggs, food to stable/*. Move 
remaining inventory to misc/*
 2014-08-18 19:15:19 -06:00
Tyler Renelle 475e4c0e4e feat(quests): Parrot quest 2014-08-18 19:00:36 -06:00
Matteo Pagliazzi 8ec929c040 chore(i18n): update locales & add latin american spanish 2014-08-18 19:03:16 +02:00
Matteo Pagliazzi ed5f67b5d4 chore(i18n): add chinese, update locales 2014-08-16 19:11:44 +02:00
Matteo Pagliazzi 9f56819d81 chore(i18n): update locales 2014-08-16 13:16:07 +02:00
Tyler Renelle 80a63575c9 feat(audio): update audio locales for https://github.com/HabitRPG/habitrpg/commit/39911ef8e043cd3826d3c39a98126df8dad6a793 2014-08-15 18:13:44 -06:00
Tyler Renelle 808c06e46f Merge pull request #275 from Fandekasp/add_audio 
add music translatable strings
 2014-08-15 17:28:31 -06:00
Matteo Pagliazzi 1a7646bc98 chore(i18n): update locales 2014-08-15 20:18:08 +02:00
Tyler Renelle d3520e48e4 feat(quests): lvl 15 ATOM quest drop 2014-08-12 16:18:08 -07:00
Adrien Lemaire 5ca2084744 add shared logic for tag sorting 2014-08-10 23:01:30 +09:00
Adrien Lemaire 0d18bc8a8f add 2 more translatable strings 2014-08-09 18:58:08 +09:00
Adrien Lemaire 31946ceb6a add music translatable strings 2014-08-09 18:07:35 +09:00
Tyler Renelle 431b1da73e Merge pull request #273 from efim/develop 
Added notification to challenge prize pop,
 2014-08-08 08:04:22 -06:00
efim 4deb824901 Added notification to challenge prize pop, for issue #2094, until gems get refunded on challenge cancelation. 2014-08-08 02:47:25 +04:00
Tyler Renelle abdc16798d Revert "Change newPassSent to reflect 'Reset Password' not failing on non-existent email" 
This reverts commit 2d2c2d27a1.
 2014-08-07 08:32:25 -06:00
Tyler Renelle b8fe6903b3 Merge pull request #259 from 3onyc/security/prevent-email-disclosure 
Change newPassSent to reflect 'Reset Password' not failing on non-existent email.
 2014-08-06 18:38:46 -06:00
Tyler Renelle 33b3448e1f fix(backgrounds): borders 2014-08-05 20:53:20 -06:00
Tyler Renelle a083d4cb60 Merge pull request #271 from lemoness/develop 
Background Borders
 2014-08-05 19:24:39 -06:00
Lemoness 7fe4628f1d Background Borders 2014-08-05 18:08:44 -07:00
Tyler Renelle b73cc259b2 feat(backgrounds): add august bgs set 2014-08-05 15:16:31 -06:00
deilann d351f85264 Merge pull request #269 from vIiRuS/develop 
Make sleeping in Inn more obvious
 2014-08-04 16:40:08 -07:00
Matteo Pagliazzi 30dabb319c chore(i18n): update locales 2014-08-04 21:51:39 +02:00
Phillip Thelen 766f663b02 Add skin images with sleeping eyes and make ZZZ more visible 2014-08-03 20:33:21 +02:00
Matteo Pagliazzi 3356f45f50 chore(i18n): update locales 2014-08-03 15:30:06 +02:00
Alice Harris a44272c7c8 Merge pull request #268 from Alys/defaultAvatar 
rename Head section, add title for new Hairstyle subsection
 2014-08-03 08:22:35 +10:00
Jeremy Lee 09dd0663e7 rename Head section, add title for new Hairstyle subsection https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 08:18:17 +10:00
Matteo Pagliazzi d1860c3ffc chore(i18n): update locales 2014-08-02 10:29:09 +02:00
Alice Harris 8dafc72b7d Merge pull request #249 from Alys/questWarning 
change quest warning to match current behaviour
 2014-08-02 13:10:08 +10:00
Alice Harris bb9899b7ce Merge pull request #266 from Alys/modsColours 
remove redundant message in Tavern now that mod names are styled
 2014-08-02 12:57:39 +10:00
Alice Harris ba42b3e805 Merge pull request #267 from Alys/playerTiers 
add texts for new moderator/guardian level, and "staff" and "tier"
 2014-08-02 12:54:18 +10:00
Jeremy Lee ddb669834b add texts for new mdoerator/guardian level, and related stuff 2014-08-02 10:45:16 +10:00
Jeremy Lee 1acbde6e3a remove redundant color message now that correct styling is on moderator names above Tavern chat 2014-08-02 07:29:16 +10:00
Tyler Renelle 42dc537f6d Merge pull request #258 from jobywalker/candycane-perception 
Candy Cane text boosts Perception not Strength
 2014-08-01 15:26:23 -06:00
Alice Harris 2a28b208d9 Merge pull request #254 from Alys/chillingFrostDailiesHurt 
explain that Chilling Frost does not stop dailies from hurting you - fixes https://github.com/HabitRPG/habitrpg/issues/3795
 2014-08-02 07:04:45 +10:00
deilann 0da3654bf5 Merge pull request #264 from jobywalker/fix-freeRebirth-assignment 
Fix assignment in freeRebirth test
 2014-08-01 13:28:11 -07:00
Joby Walker aa4bd944c9 Fix assignment in freeRebirth test 2014-08-01 13:20:13 -07:00
Tyler Renelle b3fd859cad chore(npcs): back to normal npcs 2014-08-01 14:07:01 -06:00