290e602f21
Added brackets to quest.boss check. Closes #4526
2015-01-16 10:22:47 -06:00
0b63e48c6e
feat(quest): T-Rex pet
...
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
2015-01-15 15:38:51 -06:00
0bd22e7c77
disallow fetching of chat messages
2015-01-13 06:10:46 +10:00
0b28f6df55
fix(plans): when gifting subscription, set plan.dateUpdated so it can
...
roll gemCapExtra next month. Fixes #4480
2015-01-07 14:59:38 -07:00
b854663b92
fix(loggly): do not pass apiKey
2015-01-06 09:05:30 +01:00
d5eb5bbfe0
fix(content): Cannot call 'toString' of undefined
2015-01-03 23:20:16 +01:00
1051c0d50e
maybe fixes the multilingual content result
2015-01-02 02:22:22 +01:00
edf66cbb59
feat(discount) google discount & use sub.key instead of sub.months
2014-12-30 20:05:07 -07:00
85f4a2884a
add some more debugging for cron
2014-12-27 12:56:54 +01:00
635ebf626b
fix(flag-email): correctly format date
2014-12-23 18:54:56 +01:00
8e0358f7c7
Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat
2014-12-23 10:08:01 -06:00
84db289957
Merge branch 'develop' into add-flag-to-chat
2014-12-23 10:07:42 -06:00
4c785e8459
fix(flag-chat): correct url for tavern flags
2014-12-22 21:09:27 +01:00
37b9e5012a
Added links to user modals
2014-12-22 13:22:42 -06:00
2d4c5e7b98
feat(flag-chat): fetch author and add some group variables
2014-12-22 20:02:22 +01:00
7aff280a71
feat(flag-chat): add some variables
2014-12-22 19:56:11 +01:00
652ce10e22
feat(flag-chat): start implemnting email
2014-12-22 19:48:03 +01:00
8b3c6f94bf
fix(loggly): send more infos about cron errors
2014-12-20 16:20:40 +01:00
739d8885a3
fix(emails): remove unused variable
2014-12-19 19:59:12 +01:00
be831d864a
Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
src/controllers/groups.js
views/options/social/chat-message.jade
2014-12-18 21:58:06 -06:00
7f10049b37
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
...
Conflicts:
views/options/social/chat-message.jade
2014-12-18 21:55:50 -06:00
d91d9e1eb3
refactor(facebook): use async.auto to collect multiple vars, cleaner
...
than waterfall
2014-12-16 16:30:51 -07:00
709fb2b706
Revert "refactor(iap): use env var for google IAP". orders are being
...
left in "Chargeable - Delivered" for some reason.
This reverts commit 43961a5ab9
2014-12-16 13:07:01 -07:00
43961a5ab9
refactor(iap): use env var for google IAP, intead of key file. See
...
https://github.com/voltrue2/in-app-purchase/commit/cb31043281dc1221c61efb2dfbd13687761bceca
cc @negue
2014-12-16 11:44:58 -07:00
012e579cfe
fix(loggly): typo
2014-12-13 14:57:05 +01:00
dac2fc682d
feat(loggly): change tag based on base_url, logs internal server errors
2014-12-13 14:48:14 +01:00
8935538b53
feat(loggly): enable json loggin and start loggin errors during cron
2014-12-12 20:05:37 +01:00
e1ea1a24c8
feat(challenges): optional checkbox on group create/edit:
...
restrict challenge-creation to leader. Commented-out code for similar
setup for member invites, shouldn't be hard
2014-12-12 11:37:00 -07:00
948d5762cd
fix(flag-message): small refactor
2014-12-12 11:39:22 +01:00
7d38eb3b59
Allow admin to reflag a message they've flagged and unflagged previously
2014-12-12 11:05:21 +01:00
b1600198be
Added method for letting an admin unhide a flagged message
2014-12-12 11:05:20 +01:00
6bb51c36e2
Admin flagging counts for more, automatically hides message
2014-12-12 11:05:20 +01:00
45b91b1251
Added flagCount variable
2014-12-12 11:05:19 +01:00
3771d38d48
Added fallback for is message does not contain flags key. Added error
...
for if message was already flagged by user
2014-12-12 11:05:19 +01:00
e84880d3e8
feat(flag-message): add server methods
2014-12-12 11:05:19 +01:00
ae762837e2
refactor(challenges): cleanup challenge-creation. can use async.auto to
...
keep variables around, no need to set parent closure vars
2014-12-11 21:35:41 -07:00
a021ab2896
Allow admin to reflag a message they've flagged and unflagged previously
2014-12-11 21:43:01 -06:00
38cd0e8de1
Added method for letting an admin unhide a flagged message
2014-12-11 17:29:01 -06:00
14a38033f9
Merge branch 'negue-iap_verification' into develop
2014-12-11 14:51:31 -07:00
8ac3e312ed
Admin flagging counts for more, automatically hides message
2014-12-11 13:34:43 -06:00
6fb531234d
Added flagCount variable
2014-12-11 13:00:25 -06:00
d8515fc8de
Added fallback for is message does not contain flags key. Added error
...
for if message was already flagged by user
2014-12-11 12:16:57 -06:00
0cf7bba822
Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat
2014-12-11 10:21:19 -06:00
29382d18f7
fix(reset-password): use array for variables
2014-12-11 17:05:31 +01:00
1761752240
use email server for reset-password
2014-12-11 16:51:39 +01:00
f9cc2adda5
fix(iap): iap verification fixes
2014-12-10 14:25:00 -07:00
bb37c163cf
fix spacing
2014-12-10 14:21:03 -07:00
d92832bfb2
Hopefully a working IOS Verification
2014-12-10 14:21:03 -07:00
ecf20f423c
IAP Verification for Android
2014-12-10 14:21:03 -07:00
b59a70f128
more dummy controller, just for iap data
2014-12-10 14:21:02 -07:00
Blade Barringer