Commit Graph

133 Commits

Author SHA1 Message Date
Sabe Jones 63f00d3643 fix(sharing): Better Tweet syntax
Angular bindings would fail to parse in Tweets if the expression evaluated to something with a space in it. Adding quotes stretches the Tweet by two characters, but addresses the issue. Commit also takes out a spurious console message from the Notifications service.
2015-11-10 17:07:34 -05:00
Sabe Jones c28afc9abc feat(sharing): Buttons for more modals 2015-10-29 16:33:27 -04:00
Sabe Jones 27e3797307 Merge branch 'develop' into sabrecat/more-modals
Conflicts:
	common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
Matteo Pagliazzi 01373882c6 make error notification persistent, change text and make it translatable 2015-10-28 19:42:26 +01:00
Sabe Jones 152fb72899 fix(sharing): Needed return object 2015-10-22 15:08:04 -04:00
Sabe Jones e2cfd1bd54 feat(sharing): Load widgets from service 2015-10-22 14:37:29 -04:00
Blade Barringer 78fe1073d4 Add user sync to sendAction 2015-09-15 16:39:08 -05:00
Blade Barringer b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Sabe Jones d6f416b6d3 feat(analytics): Track party buttons 2015-09-07 12:02:01 -04:00
Blade Barringer a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Sabe Jones 3ad95e1ab7 fix(tutorial): Unstick Justin head
Fixes #5497.
2015-08-28 16:12:45 -04:00
Sabe Jones 8d713a53c4 feat(tutorial): Splash screen overhaul complete 2015-08-28 13:58:30 -04:00
Sabe Jones 2a8529012b feat(tutorial): GP and EXP awards 2015-08-25 17:09:51 -04:00
Sabe Jones 23259cd456 WIP(tutorial): Award GP and XP 2015-08-24 16:02:25 -04:00
Blade Barringer 928a54911a Return promises in groups service 2015-08-24 07:47:01 -05:00
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 1f86babad3 Assign group a type of party 2015-08-22 08:18:58 -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
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
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
Sabe Jones cafdb4d57e Merge branch 'develop' into sabrecat/party-page
Conflicts:
	common/locales/en/groups.json
2015-08-03 12:45:32 -05:00
Alys 07bdc89738 habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change. 2015-07-31 18:53:32 +10:00
Sabe Jones 1de80a3ed8 WIP(party-page): Revised invite modals 2015-07-30 16:48:08 -05:00
Blade Barringer 661e79d668 Use party variable 2015-07-28 21:27:15 -05:00
Blade Barringer 442c1f358b Use Groups.party() 2015-07-28 21:05:33 -05:00
Sabe Jones 7c56f5e7f6 fix(analytics): Tweaks per code review 2015-07-28 13:26:39 -05:00
Sabe Jones f6bbae3beb fix(analytics): Bad comparison
Corrects an error caught via test, where the check for intro tour completion would always fail. Also tweaks the updateUser behavior to save an explicit false if tour completion data is not found, including a test for that behavior.
2015-07-27 15:13:59 -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
Sabe Jones dc26e1680c Merge pull request #5661 from HabitRPG/sabrecat/mystery
July 2015 subscriber goodies
2015-07-24 12:29:07 -07:00
Sabe Jones c8982b3513 fix(analytics): Track intro tour steps 1-2 2015-07-23 15:07:37 -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
Blade Barringer f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
Sabe Jones 6d52f842ff fix(quest): Move party jump to cb 2015-07-22 11:52:15 -05:00
Sabe Jones 0313170921 feat(quests): Invite party button 2015-07-21 15:25:34 -05:00
Blade Barringer 2695419182 Use better beastMaster / mountMaster counts 2015-07-19 21:51:30 -05:00
Blade Barringer 3643d11d97 Refactor pet and mount count into one method 2015-07-19 20:56:14 -05:00
Blade Barringer aee37b2a0e Swap out pet and mount count with stat calc functions 2015-07-19 20:40:15 -05:00
Blade Barringer 89bfc83b95 Organize stat functions alphabetically 2015-07-19 20:19:16 -05:00
Blade Barringer c784b97586 Create private method for how stats should be displayed 2015-07-18 16:00:08 -05:00
Blade Barringer 53fb0ec8b0 Add display experience function 2015-07-18 16:00:07 -05:00