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

301 Commits

Author SHA1 Message Date
Blade Barringer 4177202cee Merge pull request #5855 from HabitRPG/sabrecat/party-page 
Party Page Revamp
 2015-09-06 13:28:14 -05:00
Blade Barringer f1224bc6be Use select instead of an input for cds 2015-09-06 09:36:29 -05:00
Blade Barringer 085a785e4d Convert input to select box 2015-09-06 09:22:40 -05:00
Blade Barringer 9ce6144fa4 Adjustments to custom day start 2015-09-05 15:32:49 -05:00
Blade Barringer d45602c340 Adjust spacing 2015-09-05 09:45:08 -05:00
Blade Barringer 9bcaea6fa2 Merge branch 'develop' into carolstone-chron-run-early-issue-4488 2015-09-05 09:32:24 -05:00
Blade Barringer 6fc8e0b5a5 Merge branch 'develop' into sabrecat/party-page 2015-09-05 09:20:06 -05:00
Blade Barringer f65ca3cf48 Fix bug where non-party members could not send invitations 2015-09-05 08:02:00 -05:00
Alys e0b57fa2c5 remove Show Classes Tour button from Settings page, and associated code 2015-09-05 17:29:27 +10:00
Blade Barringer 807e6eb7cf Merge branch 'develop' into sabrecat/party-page 2015-09-04 19:00:48 -05:00
Sabe Jones b5124e6cd8 fix(warnings): Show modal only once 
Also removes a random extra newline.
 2015-09-03 11:12:54 -04:00
Sabe Jones e6068b23a7 feat(analytics): Track low health modal 2015-09-02 17:03:32 -04:00
Sabe Jones e82f73c712 Merge branch 'develop' into sabrecat/modal-warnings 2015-09-02 15:17:33 -04:00
Blade Barringer a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Sabe Jones 5e8894a0a6 fix(groups): Show specific invite modal 2015-08-28 16:48:39 -04:00
Blade Barringer 15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
Sabe Jones 0c0525640c Merge branch 'develop' into sabrecat/onboarding-tweaks 2015-08-25 16:47:46 -04:00
Alys bbcb9e6063 fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later 2015-08-25 19:23:25 +10:00
Sabe Jones 23259cd456 WIP(tutorial): Award GP and XP 2015-08-24 16:02:25 -04:00
Blade Barringer 66d16fefc3 Send back 204 from questLeave route 2015-08-24 12:38:43 -05:00
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 3098c7d460 Refactor invite 2015-08-23 14:47:10 -05:00
Blade Barringer 99d2b7f749 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:08 -05:00
Blade Barringer 01d122ad67 Remove unneded declaration 2015-08-22 17:04:46 -05:00
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 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 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
TheHollidayInn e762a51e4c Moved menu expand directive and created menu close directive 2015-08-19 08:53:51 -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
Sabe Jones 12b0361d45 WIP(warning-modal): Low health warning 2015-08-18 16:05:48 -04:00
Blade Barringer ee6fe4f756 Use _.find for clickStart Quest 2015-08-18 08:02:23 -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 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
Sabe Jones 5b15d603aa WIP(party-page): Broken multi-invite 2015-08-10 15:16:45 -05:00