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

396 Commits

Author SHA1 Message Date
Blade Barringer 9643b6e650 Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away 2015-08-22 17:03:26 -05:00
Alys f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10:00
Alys 28e360d7f4 change Janet Janet Mongilio to janetmango 2015-08-20 11:23:29 +10:00
Sabe Jones 99c8f941e6 chore(news): August pet Bailey 2015-08-19 17:39:11 -04:00
TheHollidayInn e762a51e4c Moved menu expand directive and created menu close directive 2015-08-19 08:53:51 -05:00
Blade Barringer fa7f957ccc Update habitrpg.com to habitica.com where applicable 2015-08-19 08:00:34 -05:00
Blade Barringer 1fecc7dc89 Change wiki links to habitica 2015-08-19 07:46:25 -05:00
Alys 8c186f3068 add close button audio menu on mobile web view - fixes https://github.com/HabitRPG/habitrpg/issues/5359 2015-08-15 15:21:17 +10:00
Blade Barringer 2821e25451 Reinstate the string interpolation 2015-08-14 18:04:04 -05:00
Blade Barringer 28dda9ae9e Fix string interpolation 2015-08-14 17:49:51 -05:00
Blade Barringer 80a6b2dcf9 Merge branch 'develop' into card_tweaks 2015-08-14 17:29:17 -05:00
Blade Barringer 80ba33bf7c Fix issue where card strings required quotes 2015-08-14 08:13:05 -05:00
Blade Barringer 6be339fc77 Fix bug where armoire notes would not display correctly 2015-08-14 06:59:23 -05:00
Sabe Jones ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00
Blade Barringer 610ce048cb Refactor card achievements 2015-08-13 22:27:14 -05:00
Sabe Jones 00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Blade Barringer bf4d690a7c Merge pull request #5775 from HabitRPG/item_store_fix 
Split out potion and armoire out of the itemStore object
 2015-08-12 22:35:54 -05:00
Blade Barringer bcf7c9712e Split out potion and armoire out of the itemStore object 
Fixes #5743
 2015-08-12 18:53:49 -05:00
Sabe Jones 3c8424a83e Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards 2015-08-12 11:53:28 -05:00
Blade Barringer c7edbfb9b2 Remove empty object in close 2015-08-12 08:42:01 -05:00
Blade Barringer 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys dbbd03e6cb remove one-time binding from "You're resting in the inn" banner above Dailies column - fixes https://github.com/HabitRPG/habitrpg/issues/5693 2015-08-12 16:53:51 +10:00
Alys 879ba83002 change habitrpg.com to habitica.com where appropriate - email addresses in static Contact page and various in-game URLs 2015-08-12 16:12:59 +10:00
Blade Barringer 869b27d786 Correct markdown 2015-08-11 20:01:45 -05:00
Blade Barringer 0dc10b5f8e Convert valentines to markdown 2015-08-11 18:47:12 -05:00
Blade Barringer a29dd4cc16 Correct styling for focusable buttons 
Fixes #5767
 2015-08-11 18:34:46 -05:00
Blade Barringer 787cb6cabb Final adjustments to PR 
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
 2015-08-05 18:27:24 -05:00
Simon Gabler 2343e4720c Add tooltips for day buttons to show "due" or "not due" 2015-08-05 22:25:03 +02:00
Simon Gabler 1997338751 Show popover for daily and weekly dailies 2015-08-05 22:23:41 +02:00
Simon Gabler 99bdf4c541 Add hint for "Repeat every" option title. Fixes #5603 2015-08-05 17:02:02 +02:00
Sabe Jones bc11e03bef fix(sharing): Localize Tweet text 2015-08-04 14:55:15 -05:00
Sabe Jones 60e65a8bea feat(armoire): August additions 
Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.
 2015-08-04 12:45:01 -05:00
Matteo Pagliazzi 4f333c4f8a fix(amazon-payments): swap colors between paypal and amazon 2015-08-03 18:41:34 +02:00
Blade Barringer 1b19cc1c4d Merge branch 'teh-maxh-patch-1' into develop 2015-08-03 07:54:15 -05:00
Sabe Jones af4bb5e23f chore(news): End Summer Splash 2015-08-02 14:09:26 -05:00
Max Harmony 7c4331080c add'l link changes 2015-08-02 01:03:34 +00:00
Max Harmony 7b5822be4d new Habitica urls 2015-07-31 16:09:44 +00:00
Sabe Jones 65f21619ae feat(naming-day): Bailey etc. 2015-07-30 19:46:04 -05:00
Sabe Jones b4e3efeab7 fix(news): Break before list 
For readability
 2015-07-29 14:17:32 -05:00
Sabe Jones bbbae27631 chore(naming-day): Bailey and sprites 2015-07-29 14:12:04 -05:00
Sabe Jones 39a17d933d fix(achievements): Day copypasta 2015-07-28 16:26:46 -05:00
Sabe Jones ceb9cf7817 WIP(event): Habitica Day 2015-07-28 16:20:08 -05:00
Blade Barringer e72543641c Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed 
Closes #5668
 2015-07-25 23:22:35 -05:00
Blade Barringer f31d1b4b1b Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix 2015-07-24 22:16:57 -05:00
Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
 2015-07-24 16:11:51 -05:00
Sabe Jones d32d05e873 feat(mystery): July 2015 goodies 
Also makes the mystery box opening notification translatable and adds item graphics to it.
 2015-07-23 12:05:13 -05:00
Blade Barringer c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Sabe Jones 0f1c92184c chore(news): iOS update Bailey 2015-07-22 15:42:35 -05:00
Sabe Jones 7d622792a8 Merge pull request #5635 from HabitRPG/sabrecat/quests-page 
Improve quest drop notification
 2015-07-22 10:28:16 -07:00