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

273 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 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
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 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
Sabe Jones 28ae6afd92 WIP(party-page): UI draft 2015-08-10 13:42:36 -05:00
Sabe Jones f1704a6a92 WIP(party-page): Active party page 2015-08-06 12:13:50 -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
Sabe Jones 1de80a3ed8 WIP(party-page): Revised invite modals 2015-07-30 16:48:08 -05:00
Sabe Jones e9ed561907 fix(analytics): Add missing ID update 
Also make the order of partyID and partySize consistent across updateUser calls.
 2015-07-27 14:34:31 -05:00
Sabe Jones 9d7a2a1c24 feat(analytics): Party properties 
Adds tracking of the user's party ID and size as user-level analytics properties.
 2015-07-27 14:25:11 -05:00
Blade Barringer 6aae668b8c Rework gem adjustment so it actually makes sense 2015-07-24 17:30:47 -05:00
Blade Barringer 9e25c29e04 Correct maxPrize calculation 2015-07-24 17:30:47 -05:00
Blade Barringer e37c60e0f2 Expand functions to make them readable 2015-07-24 17:30:45 -05:00
Blade Barringer 0b85dc3e27 Correct getChallenges name 2015-07-24 17:30:44 -05:00
Blade Barringer 61d0172567 Add mising semi colons and line breaks 2015-07-24 17:30:43 -05:00
Blade Barringer bac979ca4d Eliminate unused variable 2015-07-24 17:30:42 -05:00
Blade Barringer 2441f6363e Consolidate transition code 2015-07-24 17:30:42 -05:00
Blade Barringer 5cd42e85c7 bail out and alert user if prize is too high 2015-07-24 17:30:41 -05:00
Blade Barringer 7c4486e001 Use gem calc functions 2015-07-24 17:30:41 -05:00
Blade Barringer c92678008b Write functions to check if user has balance for challenge creation 2015-07-24 17:30:41 -05:00
Blade Barringer cb27c3dc44 Correct indentation and equality checks on shuldShowChallenge 2015-07-24 17:30:40 -05:00
Blade Barringer eea01216d7 Move backToChallenges to private functions section 2015-07-24 17:30:40 -05:00
Blade Barringer fb6a34c2ed Set default group to tavern if no default group is found 2015-07-24 17:30:40 -05:00
Blade Barringer fe2fb6deba Remove out of context comment 2015-07-24 17:30:40 -05:00
Blade Barringer f8e2e74336 Move getChallenges private method to bottom of file 2015-07-24 17:30:39 -05:00
TheHollidayInn ef9dfac087 Create new function to check for enough gems, added @crookedneighbor 's tests, and added tests to check for enoughGems when user creates a habitrpg challenge 2015-07-24 17:30:37 -05:00
TheHollidayInn 53c21b07a3 Reset enough gems variable if user selects group other than habitrpg 2015-07-24 17:30:36 -05:00
TheHollidayInn fce622ddc7 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-07-24 17:30:36 -05:00
Blade Barringer fca6f91f13 Merge branch 'develop' into analytics-service-server-side 2015-07-24 15:19:31 -05:00