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

638 Commits

Author SHA1 Message Date
Amin Arria f79110d6d2 Changed to be more like the FAQ 2015-11-03 22:03:24 -04:30
Amin Arria 167af1afd4 New static page: overview 2015-11-03 13:35:14 -04:30
Blade Barringer 2713b0f26f chore(i18n): update locales 2015-11-02 22:08:28 -06:00
Blade Barringer c419ca8839 Merge pull request #6068 from AminArria/Wrong-max-level-messages 
Wrong max level messages
 2015-10-30 23:21:29 -05:00
Blade Barringer 898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -05:00
Thrashmandicoot 76de8af848 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 20:02:16 -07:00
Blade Barringer ad6fbef85c Move chat tests to new infrastructure 2015-10-30 14:47:14 -05:00
Blade Barringer e8fa22bf93 chore(i18n): update locales 2015-10-30 09:25:43 -05:00
Blade Barringer aa111b3c1a Update tests to assert against translation strings 2015-10-30 09:01:57 -05:00
Thrashmandicoot 64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00
Thrashmandicoot ebbc72e9c2 Refactor sellForGold, add displayPotion/item 2015-10-30 02:26:41 -07:00
Alys 1923a3a467 change on-hover text for Mystery Item gift box to just mention wiki page 2015-10-30 06:59:54 +10:00
Alys 11ae4a9b87 change on-hover text for Mystery Item gift box to link to wiki page and remove statement about finding exact date on wiki 2015-10-30 06:30:11 +10:00
Blade Barringer dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Amin Arria bd230df0d3 Added rebirthLevel var to remove need of extra translation string 2015-10-28 14:33:45 -04:30
Matteo Pagliazzi 01373882c6 make error notification persistent, change text and make it translatable 2015-10-28 19:42:26 +01:00
Blade Barringer 5754b4f72a chore(i18n): update locales 2015-10-27 21:38:23 -05:00
Blade Barringer 1a6b1f2a1c Update string 2015-10-27 21:36:52 -05:00
Blade Barringer b82054128d chore(i18n): update locales 2015-10-27 21:36:51 -05:00
Blade Barringer 711413f832 Update string 2015-10-27 21:28:33 -05:00
Blade Barringer cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
nicolevonvon 47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00
Blade Barringer c04b27ffd5 Simplify community guidelines string 2015-10-26 18:08:45 -05:00
Blade Barringer f0e4149adb Merge branch 'develop' into ksami-develop 2015-10-26 17:56:05 -05:00
Sabe Jones 392889c7da feat(mystery): October 2015 subscriber set 2015-10-23 15:45:43 -04:00
ksami f2c856f6e6 Make link translatable in options/inventory/time-travelers 2015-10-23 23:40:11 +08:00
ksami b3cc58886c Make strings translatable in options/social/chat-box 2015-10-23 23:20:59 +08:00
Sabe Jones d0a34fc0ad feat(quests): 2015-10 Pet 
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
 2015-10-20 12:32:45 -04:00
Sabe Jones 0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Amin Arria 23114ac929 Fix trailing comma 2015-10-19 17:19:30 -04:30
Amin Arria 3bd809f7c2 Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages 2015-10-19 12:14:38 -04:30
Amin Arria 038039dbee Fixes #5550, change message according to rebirthLevel 2015-10-19 12:10:27 -04:30
Blade Barringer 9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer 1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Ricardo Mendes 860abce1d7 Adds auto-equip string to locales/en 2015-10-19 05:20:10 +00:00
ksami 65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Sabe Jones 380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Alys 30de99b700 adjust world bosses FAQ answer 2015-10-13 06:49:07 +10:00
Alys ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Sabe Jones 4044b0cb64 fix(world-boss): Update mechanics explanation 2015-10-08 18:48:13 -04:00
Blade Barringer 60cc428b81 chore(i18n): update locales 2015-10-08 17:42:10 -05:00
Sabe Jones 58801f5025 fix(world-boss): Don't repeat explanation 2015-10-08 13:17:49 -04:00
Thrashmandicoot a1328bc837 Add bolding to item name 2015-10-07 20:10:27 -07:00
Thrashmandicoot 921cb3ca5d Add displayXForGold keys, refactor sell egg for gold 2015-10-07 19:17:13 -07:00
Sabe Jones d27fb9dba2 WIP(world-boss): Rage and rewards 
Also finishes out written story content.
 2015-10-06 15:59:16 -04:00
Sabe Jones f6abcc0ddf WIP(world-boss): Initial stats outlay 
Also quest reward sprites, groundwork for world damage, and partial content build.
 2015-10-05 16:59:19 -04:00
Sabe Jones 0d7a57d176 Merge branch 'develop' into sabrecat/world-boss 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2015-10-05 14:57:59 -04:00
Blade Barringer 6dbfbeec81 Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510 2015-10-03 06:40:50 -05:00
Blade Barringer 655d8de7c8 chore(i18n): update locales 2015-10-02 22:28:12 -05:00