Commit Graph

586 Commits

Author SHA1 Message Date
Blade Barringer c8ed73f685 Added help text for startDate 2015-06-07 00:06:31 -05:00
Blade Barringer e6ed0c961d Simplify datepickers 2015-06-06 23:27:03 -05:00
Blade Barringer 91390138bb Make reward price required 2015-06-06 23:17:10 -05:00
Blade Barringer 41d0f505f3 Simplify datepicker 2015-06-06 22:34:02 -05:00
Blade Barringer 047902ac62 Use input type date for datepicker 2015-06-06 17:55:36 -05:00
Blade Barringer bf48671c7a Add validation to everyX 2015-06-06 17:55:21 -05:00
Blade Barringer ae1d10ed30 Merge branch 'blade-Finish_weeklies_pr' into refactor-tasks-jade 2015-06-05 17:37:46 -05:00
Blade Barringer 164a26616e Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-05 17:35:16 -05:00
Sabe Jones 804cced3ff chore(various): News and sprites
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
Blade Barringer dc9bb35244 Add ng-form 2015-06-05 07:40:48 -05:00
Blade Barringer 403075262d Remove bindonce symbol from ng-repeat 2015-06-05 07:26:03 -05:00
Blade Barringer 099e0abeed Restore restore streaks functionality 2015-06-05 07:20:59 -05:00
Blade Barringer 701fa2455f Refactor task views 2015-06-04 21:37:01 -05:00
Blade Barringer b132b3c4fa Make advanced options a button 2015-06-04 17:48:59 -05:00
Sabe Jones 95bb5be22a Merge branch 'develop' into armoire
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
Sabe Jones 20859b83ef feat(Armoire): Improved counter
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
Blade Barringer db38663f94 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-04 12:45:23 -05:00
Sabe Jones 6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Blade Barringer 865f7651a9 Merge branch 'TheHollidayInn-invite-friends-in-header' into develop 2015-06-04 08:54:04 -05:00
Blade Barringer 7a1c5835d0 Final adjustments to PR #5114
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
2015-06-04 08:48:05 -05:00
Blade Barringer 076f7f0db9 Create translatable strings for dailies 2015-06-03 21:48:38 -05:00
TheHollidayInn 2234c7219e Moved invite friends button to under the subscribe button 2015-06-03 20:33:39 -05:00
Sabe Jones 09d32390f9 feat(Armoire): Item counter
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
Sabe Jones 97ae243c40 fix(Armoire): Fixes
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
2015-06-03 12:50:57 -05:00
Sabe Jones af3ee8cfcd feat(Armoire): Updates from feedback
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
Blade Barringer 7adde1d1dd Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-03 07:41:09 -05:00
negue d6f5ba0fc7 Merge pull request #5336 from negue/fixQuestNotify
FIX: Quest Invitation Notification
2015-06-03 07:52:09 +02:00
Sabe Jones c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Negue 5612b4be6b Only send "Quest Started" Notifications to users which accepted the quest 2015-06-02 20:02:14 +02:00
Nick Tomlin ee88ed4b44 Change signature of notification service 2015-06-02 12:33:21 -05:00
Negue 264a1e4b16 FIX: Quest Invitation Notification
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
Blade Barringer 24c299783a Merge branch 'TheHollidayInn-markdown-for-spells' into develop 2015-06-02 07:58:29 -05:00
Blade Barringer b375c068de Refactor notification service and add tests 2015-06-02 07:51:54 -05:00
TheHollidayInn d1df5d740d Changed button to invite friends text 2015-06-01 21:10:49 -05:00
TheHollidayInn e3f5c22fe8 Added start party option, locales, and plus button 2015-06-01 21:07:53 -05:00
TheHollidayInn 5513061d80 Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string 2015-06-01 21:07:09 -05:00
Sabe Jones 80da3a2dcd chore(news): Bailey on mounts 2015-06-01 19:17:30 -05:00
Blade Barringer 3291062b31 Move markdown parsing to notification service 2015-06-01 17:49:27 -05:00
Blade Barringer 39f363ec29 Add tests for castEnd on root controller 2015-06-01 17:38:18 -05:00
Sabe Jones d76ca1c04d feat(mystery): Programmatic presents
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
2015-06-01 12:06:35 -05:00
Sabe Jones 829ed8a161 chore(news): May 31 Bailey 2015-05-31 16:04:42 -05:00
Sabe Jones 766f3b6057 Merge pull request #5307 from HabitRPG/tutorial
Tutorial overhaul
2015-05-31 13:58:12 -07:00
Sabe Jones 8074648c70 Merge branch 'develop' into tutorial
Conflicts:
	common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
Sabe Jones 91f93df7cc Merge branch 'develop' into mixpanel
Conflicts:
	config.json.example
2015-05-31 15:40:21 -05:00
Blade Barringer d28ed6badf Correct format of directive creation to work in un-minified state
Fixes #4606
2015-05-31 15:25:32 -05:00
Matteo Pagliazzi 8a6c49f002 feat(weekly-recap): track last date of weekly recap email 2015-05-31 12:10:03 +02:00
TheHollidayInn a8ca01ba62 Added markdown filter to endCast notification 2015-05-30 22:00:29 -05:00
Sabe Jones 726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Sabe Jones 7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
Sabe Jones 6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00