10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
9a087d2d90
update angular and do not send api key to loggly
2015-01-16 17:39:47 +01:00
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
04ff888819
fix(world-boss): Scale based on current HP
2015-01-13 13:19:04 -06:00
ad7c02d50d
feat(world-boss): Healing on rage
2015-01-13 11:49:16 -06:00
385fe36a0a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-12 21:50:14 -06:00
0bd22e7c77
disallow fetching of chat messages
2015-01-13 06:10:46 +10:00
2b20c52a8d
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-10 09:25:18 -06:00
cda16d5bc0
Merge pull request #4494 from SabreCat/stressbeast
...
World boss for Winter Wonderland 2015
2015-01-08 15:51:04 -06:00
ee339fba4a
feat(event): World boss
...
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:22:42 -06:00
cba232ef83
feat(presskit): add presskit page cc @lemoness
2015-01-08 13:41:23 -07:00
6626103d06
chore(cores): allow cores==0 to not use cluster at all (even w/ single
...
core). Good for running debugger. If cores==1, it will use cluster to
restart the single node on error
2015-01-08 13:19:11 -07:00
0807e7856c
Merge remote-tracking branch 'upstream/develop' into mountmaster
2015-01-08 11:31:45 -06: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
a98f73dd8d
tmp(newrelic) remove newrelic until #4471 fixed
2015-01-03 13:59:56 -07:00
19fc403b2f
Clarified comments in user model
2015-01-02 15:26:16 -06:00
1051c0d50e
maybe fixes the multilingual content result
2015-01-02 02:22:22 +01:00
0fd3f290b8
Merge branch 'develop' into mountmaster
2014-12-31 13:14:11 -06:00
d1355faa31
Merge pull request #4452 from SabreCat/nye
...
New Year's event features
2014-12-30 22:18:11 -06:00
8eebaea3dd
woops.. :/
2014-12-30 20:41:54 -07:00
edf66cbb59
feat(discount) google discount & use sub.key instead of sub.months
2014-12-30 20:05:07 -07:00
d8cfc1dd4b
WIP(NYE): New Year's cards
2014-12-29 20:58:28 -06:00
756fa83418
fix(date): typo
2014-12-29 22:26:12 +01:00
cb13b5ac26
fix(date): add YYYY/MM/DD format
2014-12-29 22:16:58 +01:00
4a37bec652
fix(pr): indentation and simplify
2014-12-29 21:21:54 +01:00
752161b284
Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat
2014-12-29 21:09:04 +01:00
85f4a2884a
add some more debugging for cron
2014-12-27 12:56:54 +01:00
2de3e65043
Fix merge conflicts with test values
2014-12-26 16:00:45 -05:00
8852ad61b2
Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed
2014-12-26 15:52:42 -05:00
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
03f12a3718
Make it possible to choose between MM/dd and dd/MM date format
2014-12-24 22:18:50 -05: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
492260d74a
refactor(coupons): coupons cleanup using async.auto
2014-12-20 17:58:00 -07: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
7c0b25d58a
pass base_url to emails as variable
2014-12-19 19:46:05 +01:00
be37e88dc3
Corrected example for send gift to be correct
2014-12-19 11:06:09 -06:00
d358236f42
Corrected example for show private message so it would result in a valid
...
call
2014-12-19 11:06:09 -06:00
a078636416
Fixed get members so it can be used on static/api page
2014-12-19 11:06:09 -06: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
Blade Barringer