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

420 Commits

Author SHA1 Message Date
Blade Barringer 950fab237d Correct invite users to guild 2015-08-22 12:52:21 -05:00
Blade Barringer 63b492ab51 Merge branch 'develop' into sabrecat/party-page 2015-08-22 12:44:07 -05:00
Blade Barringer 60a36ca6fc Correct view 2015-08-22 08:18:39 -05:00
Blade Barringer 53531ae296 Add btn-block class 2015-08-22 07:42:15 -05:00
Blade Barringer d55da12c01 Hide + button on invite by uuid tab 2015-08-22 07:41:54 -05:00
Blade Barringer 3153fbac3c Fix bug where mutliple user ids could not be saved 2015-08-21 08:19:39 -05:00
Alys f9a0e494a7 changed "The Dreadful Cheetah" to "Such a Cheetah" 2015-08-21 20:49:58 +10:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05: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
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -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
Blade Barringer 14ae3b1046 Add one time binding 2015-08-17 22:07:09 -05:00
Blade Barringer ba2988ac98 Use new content for mixin 2015-08-17 21:51:08 -05:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04: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
Sabe Jones c4c563aca1 WIP(party-page): Restore Guild invite modal 2015-08-14 13:17:19 -05:00
Sabe Jones 572e64e3ed WIP(party-page): Refactor groups service 2015-08-14 12:58:46 -05:00
Sabe Jones 0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
 2015-08-14 11:23:35 -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
Sabe Jones 2d8fdab496 WIP(party-page): Roll back to 1x invites 
Also a draft of logic for 1-step create group + invite people.
 2015-08-12 11:29:36 -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
Sabe Jones 5b15d603aa WIP(party-page): Broken multi-invite 2015-08-10 15:16:45 -05:00
Sabe Jones beacce7fe0 Merge branch 'develop' into sabrecat/party-page 2015-08-10 13:43:44 -05:00
Sabe Jones 28ae6afd92 WIP(party-page): UI draft 2015-08-10 13:42:36 -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
Sabe Jones c275db6b4b Merge branch 'develop' into sabrecat/party-page 2015-08-05 12:43:56 -05: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