Matteo Pagliazzi
|
ea04ebac4e
|
Merge pull request #4611 from HabitRPG/paglias/email-notifications
feat(email-notifications): implement email notifications for events
|
2015-02-02 17:02:22 +01:00 |
|
Matteo Pagliazzi
|
b0a2f1fcaa
|
check for subscription preferences when sending party invitations
|
2015-02-02 16:50:14 +01:00 |
|
Matteo Pagliazzi
|
d211bc7f86
|
feat(email-notifications): implement email notifications for events
|
2015-02-02 15:40:56 +01:00 |
|
Blade Barringer
|
403554ae3a
|
Users cannot block admins. Also corrected logic so user cannot block
themselves
|
2015-02-01 15:26:16 -06:00 |
|
Blade Barringer
|
cbc4e1efea
|
Adjusted subscription page to use correct formatting with one time
bindings
|
2015-02-01 09:27:10 -06:00 |
|
Matt T Elliott
|
1da26acc93
|
fix jade vs angular
|
2015-02-01 09:27:10 -06:00 |
|
Matt T Elliott
|
f6aefa5cf4
|
fix spacing
|
2015-02-01 09:27:09 -06:00 |
|
Matt T Elliott
|
cec5797fc9
|
fix presskit and header
|
2015-02-01 09:27:09 -06:00 |
|
Matt T Elliott
|
978ba0186e
|
fix bg popover translations
|
2015-02-01 09:25:44 -06:00 |
|
Matt T Elliott
|
71436288ff
|
fix quest rewards translation
|
2015-02-01 09:25:44 -06:00 |
|
Matt T Elliott
|
0d08f3edb0
|
fix translations on presskt page
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
aefcd116ab
|
fix translations on coupon page
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
4ed80824bf
|
fix translations on task progress chart
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
026b4ed716
|
add translations to subscription page
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
c31272a154
|
add subscriptitonRateText
|
2015-02-01 09:25:43 -06:00 |
|
Matteo Pagliazzi
|
eb1ca43c44
|
fix(db): upgrade flags.recaptureEmailsPhase to new values
|
2015-02-01 12:56:07 +01:00 |
|
Tyler Renelle
|
8670e269ed
|
upgrade mongoose => 3.8.20, upgrade npm
|
2015-01-30 17:26:35 -07:00 |
|
Alice Harris
|
e8eec7386e
|
fix comment in script
|
2015-01-31 09:19:46 +10:00 |
|
Alice Harris
|
5e671568ac
|
remove new birthday robes from people who don't have original birthday achievement
|
2015-01-31 09:17:23 +10:00 |
|
Sabe Jones
|
18afb1ce18
|
Merge pull request #4592 from SabreCat/birthday
Habit Birthday 2015
|
2015-01-30 13:55:00 -06:00 |
|
Sabe Jones
|
47d14a1f99
|
fix(news): Prettify Bailey more
|
2015-01-30 13:51:48 -06:00 |
|
Sabe Jones
|
4fe4c01f3c
|
fix(news): Left right left
|
2015-01-30 13:48:44 -06:00 |
|
Sabe Jones
|
0007e870ed
|
chore(news): Bailey
|
2015-01-30 13:44:09 -06:00 |
|
negue
|
3e41b62bc9
|
Include mixins.jade also in layout.jade
|
2015-01-30 17:47:55 +01:00 |
|
Matteo Pagliazzi
|
ea3d72836f
|
add image for new email
|
2015-01-30 17:14:34 +01:00 |
|
negue
|
e6a5feeeb6
|
Merge pull request #4590 from negue/fixAchievementsOnMobile
aLink mixin to handle mobile links
|
2015-01-30 00:17:10 +01:00 |
|
Sabe Jones
|
5188b17f54
|
chore(user): Deprecation TODO
|
2015-01-29 14:13:57 -06:00 |
|
Sabe Jones
|
efd1333c06
|
fix(event): Leave old achievement
For better compatibility with mobile app.
|
2015-01-29 14:10:05 -06:00 |
|
Sabe Jones
|
a654d7ea10
|
fix(event): Correct achievement award
|
2015-01-29 13:43:52 -06:00 |
|
Negue
|
e165f5dac4
|
move aLink to mixins.jade
|
2015-01-29 20:40:06 +01:00 |
|
Sabe Jones
|
4ebc2953f5
|
feat(event): Habit Birthday 2015
|
2015-01-29 13:02:26 -06:00 |
|
Blade Barringer
|
6b25797154
|
Added reminder about swearing to the tavern chat box
|
2015-01-29 12:22:26 -06:00 |
|
Negue
|
4a16deb50d
|
aLink mixin to handle mobile links
|
2015-01-29 18:16:33 +01:00 |
|
Matteo Pagliazzi
|
01d695cae5
|
fix(grunt): allow caching of spritesheets, fix #4542
|
2015-01-29 17:59:30 +01:00 |
|
Blade Barringer
|
154b8a00e5
|
Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes
Quest scroll popover and modal changes
|
2015-01-28 15:39:32 -06:00 |
|
Blade Barringer
|
5f1d138241
|
Added comment about questPopover function
|
2015-01-28 15:38:41 -06:00 |
|
Blade Barringer
|
275f55cbfe
|
Removed extra space
|
2015-01-28 15:36:13 -06:00 |
|
Blade Barringer
|
c328d0fd3c
|
Removed hp from popover function
|
2015-01-28 15:11:32 -06:00 |
|
Blade Barringer
|
043baf4961
|
Removed hp from modals
|
2015-01-28 15:10:21 -06:00 |
|
Blade Barringer
|
e6e1ea086e
|
Fixed alignment of notes on tasks
|
2015-01-28 14:51:51 -06:00 |
|
Blade Barringer
|
d3d12bc638
|
Added popover-append-to-body to inventory popovers
|
2015-01-28 14:23:38 -06:00 |
|
Blade Barringer
|
84552597d6
|
Adjusted hrs for popovers
|
2015-01-28 14:00:06 -06:00 |
|
Blade Barringer
|
4c6bf8f543
|
Added append to body to quest scroll popovers
|
2015-01-28 13:37:34 -06:00 |
|
Matteo Pagliazzi
|
50bc48f325
|
fix(share): addthis in static pages
|
2015-01-28 20:32:35 +01:00 |
|
Blade Barringer
|
ca897d7cf3
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2015-01-28 10:56:57 -06:00 |
|
Blade Barringer
|
23c31083ef
|
Fixed triad count to actually check and make sure count is 90
|
2015-01-28 10:56:16 -06:00 |
|
benmanley
|
dc5f980083
|
fix(tasks): improve habit icon alignment
See #4539
Align habit buttons using a different CSS technique to prevent plus
icon from being cropped on Chrome for Windows.
|
2015-01-28 13:25:24 +00:00 |
|
Blade Barringer
|
d8e09884a0
|
Added quest image and info to quest invitation modal
|
2015-01-27 20:37:09 -06:00 |
|
Blade Barringer
|
a77a46c543
|
Added one time bindings to quest modals
|
2015-01-27 20:27:14 -06:00 |
|
Blade Barringer
|
eaaa09c75a
|
Added quest details to buy quest and show quest modals
|
2015-01-27 20:16:11 -06:00 |
|