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
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
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
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
8074648c70
Merge branch 'develop' into tutorial
...
Conflicts:
common/locales/en/npc.json
2015-05-31 15:52:12 -05:00
8a6c49f002
feat(weekly-recap): track last date of weekly recap email
2015-05-31 12:10:03 +02:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
b23e901780
Merge branch 'develop' into pushNotifications2
2015-04-27 17:20:25 +02:00
37f7db3c4e
feat(emails): add support for weekly recap emails
2015-04-22 16:30:53 +02:00
71108ee935
feat(email): WIP start implementing unsubscription page and related features
2015-04-07 14:04:03 +02:00
7d735519ec
feat(email-unsubscription-page): create model to hold unsubscriptions
2015-04-07 14:04:03 +02:00
f0e7f0464c
fix(seasonal): NO FLOWERS
...
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
b6a4d65d8c
feat(seasonal): Shiny Seed
2015-04-01 22:36:07 -05:00
7105bc195f
add all Changes of #4565
2015-03-27 18:35:32 +01:00
e46789c303
feat(analytics): track cron count
2015-03-26 17:11:33 -04:00
560d51b2e2
feat(tour): esc force closes, but puts justin head in toolbar. clicking
...
justin head brings tour back.
2015-03-24 15:41:44 -06:00
1e8265a9f1
feat(tour): add the other tour entries @lemoness
2015-03-19 15:53:12 -06:00
9e540e86af
add email with optional message when kicking user from group
2015-03-18 19:12:53 +01:00
de67f44e1f
Merge pull request #4713 from HabitRPG/lefnire/interactive-tour
...
Interactive Tour
2015-03-10 19:23:01 -06:00
9cfa27f089
feat(surveys): Survey achievement
...
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
2015-03-10 18:39:00 -05:00
812493fec5
feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides
2015-03-10 15:40:18 -06:00
397a293ca8
change text for recapture emails settings
2015-02-20 18:15:47 +01:00
17032a4f13
Reverted changes back into website/src
2015-02-10 16:06:32 -06:00
bf4f2299e2
Moved src to website/src (again)
2015-02-10 16:04:17 -06:00
e243887563
Deleted website/src
2015-02-10 16:03:11 -06:00
75c9b5a978
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
...
Conflicts:
src/controllers/groups.js
src/controllers/payments/index.js
src/controllers/user.js
src/models/user.js
2015-02-09 22:21:27 -06:00
cc767efa20
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
...
Conflicts:
src/controllers/auth.js
src/controllers/challenges.js
src/controllers/groups.js
src/controllers/members.js
src/controllers/payments/index.js
src/controllers/user.js
src/middleware.js
src/models/user.js
2015-02-03 21:13:55 -06:00
5ddb44a65b
Corrected path to common module
2015-02-03 16:45:53 -06:00
220942fb9d
Corrected path to common files
2015-02-03 14:17:21 -06:00
8a8ce8d80d
Moved folders to website directory
2015-02-03 14:10:55 -06:00
Sabe Jones