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

473 Commits

Author SHA1 Message Date
Blade Barringer 67e60e7d06 Add loading screen between leaving old party and joining new one 2015-08-22 12:42:52 -05:00
Blade Barringer 93f02363e5 Add feature to join new party if user is in a party of one 2015-08-22 12:19:37 -05:00
Blade Barringer 1ff597e944 Provide group name if not provided and save 2015-08-22 08:40:16 -05:00
Blade Barringer 1f86babad3 Assign group a type of party 2015-08-22 08:18:58 -05:00
Blade Barringer cac5770649 Remove console log 2015-08-22 08:17:02 -05:00
Blade Barringer 07b9b35234 Filter out blank emails 2015-08-21 21:39:04 -05:00
Blade Barringer 59dc0cdb4f Add method to remove blank uuids 2015-08-21 21:28:52 -05:00
Blade Barringer 3153fbac3c Fix bug where mutliple user ids could not be saved 2015-08-21 08:19:39 -05:00
Blade Barringer e8b658b0de Add controllers to manifest and sort them 2015-08-20 08:17:47 -05:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Blade Barringer 635c1ecd5a Make openInviteModal function more readable 2015-08-19 08:53:43 -05:00
Blade Barringer 0eb61a5bec Split out group controllers into separate files 2015-08-19 08:20:13 -05:00
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -05:00
Blade Barringer 45b7e9a7d2 Remove .DS_Store files 2015-08-19 08:07:06 -05:00
Blade Barringer ee6fe4f756 Use _.find for clickStart Quest 2015-08-18 08:02:23 -05:00
Blade Barringer a57e19bdba Convert to private methods 2015-08-18 07:34:49 -05:00
Blade Barringer ab7a23ad00 Add quest abort function back in 2015-08-17 22:15:51 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Alys 8e667b1019 delete an outdated favicon.ico file - partial fix for https://github.com/HabitRPG/habitrpg/issues/5464 2015-08-16 14:35:38 +10:00
Blade Barringer 426acf44c8 Wrap task analytics in if statement 2015-08-14 23:43:47 -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
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
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 7c6641482a Merge pull request #5776 from crookedneighbor/qhUQxV7Q_add_number_of_user_tasks_to_analytics 
Analytics improvements
 2015-08-12 22:31:44 -05:00
Blade Barringer ceec310e5f Use human readable name 2015-08-12 22:16:30 -05:00
Blade Barringer 9a27b2e8cb Add task numbers to analytics 2015-08-12 21:47:04 -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 203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys f4c89f9379 initialise buyThis message variable at point of declaration - fixes https://github.com/HabitRPG/habitrpg/issues/5770 2015-08-12 21:26:51 +10: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
Sabe Jones f97012798e WIP(party-page): Party preview graphic 2015-08-06 16:36:28 -05:00
Sabe Jones f1704a6a92 WIP(party-page): Active party page 2015-08-06 12:13:50 -05:00
Simon Gabler 2343e4720c Add tooltips for day buttons to show "due" or "not due" 2015-08-05 22:25:03 +02:00
Sabe Jones c275db6b4b Merge branch 'develop' into sabrecat/party-page 2015-08-05 12:43:56 -05:00
Sabe Jones 68cc0fd56a fix(avatar): Delist Splashy Skins 
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
 2015-08-04 15:17:38 -05:00
Blade Barringer c402ec61b2 Remove checkmark from focused task, increase opacity of background 
Fixes #5682
 2015-08-04 08:16:31 -05:00
Sabe Jones cafdb4d57e Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/locales/en/groups.json
 2015-08-03 12:45:32 -05:00
Blade Barringer 01237df213 Add buttons to challenge participant modal 2015-08-03 08:40:33 -05:00
Simon Gabler cba9752111 Add mod Cantras to community guidelines page. Fixes #5676 2015-07-31 23:05:17 +02:00
Alys 07bdc89738 habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change. 2015-07-31 18:53:32 +10:00
Alys 798b2890d0 HabitRPG -> Habitica text changes 2015-07-31 18:05:10 +10:00