2313211d30
Merge branch 'develop' into common-convert
2015-02-01 11:55:17 -06:00
eb1ca43c44
fix(db): upgrade flags.recaptureEmailsPhase to new values
2015-02-01 12:56:07 +01:00
5188b17f54
chore(user): Deprecation TODO
2015-01-29 14:13:57 -06:00
4ebc2953f5
feat(event): Habit Birthday 2015
2015-01-29 13:02:26 -06:00
07870e1c7c
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
2015-01-26 19:36:38 -06:00
eceaaef954
Merge pull request #4567 from crookedneighbor/add-audio-watts
...
Added Watts' Theme to Audio Choices
2015-01-26 11:27:27 -06:00
23f1dd59c5
Converted shared to common for controllers
2015-01-25 15:26:37 -06:00
6472e04bd0
Changed shared to common for payments
2015-01-25 15:22:04 -06:00
af4f51857b
Changed models to use common instead of shared
2015-01-25 15:10:15 -06:00
c5c0125c49
Converted routes to use common instead of habitrpg-shared
2015-01-25 15:08:03 -06:00
1290581f39
Converted some files to use common instead of habitrpg-shared
2015-01-25 15:05:15 -06:00
de59c76609
Added watts themes to audio choices
2015-01-23 14:53:30 -06:00
ec114d6a3e
chore(news): Victory Bailey
...
Also includes a fix to disallow party quest bosses from using Rage healing to exceed initial Health.
2015-01-23 10:20:50 -06:00
5c8450ba1a
Corrected triad bingo achievement for users that already had it
2015-01-20 19:26:29 -06:00
5246257f62
Merge pull request #4550 from HabitRPG/bailey-20150120
...
Bailey 20150120 & Mount Master
2015-01-20 17:06:14 -06:00
925bfe8af4
fix(emails): parse json
2015-01-20 20:59:43 +01:00
9d22e65e19
fix(flags-emails): allow arrays in FLAG_REPORT_EMAIL
2015-01-20 18:33:49 +01:00
065227fa8c
fix(flags-emails): allow arrays in tnxEmails
2015-01-20 18:29:46 +01:00
07fec4a205
Merge branch 'mountmaster' into bailey-20150120
2015-01-20 10:30:40 -06:00
f0d4135d54
Merge pull request #4546 from SabreCat/stressbeast
...
World boss desperation move
2015-01-19 23:17:32 -06:00
da2d59734c
fix(world-boss): simplify desperation stats
2015-01-19 23:00:00 -06:00
0137dd7209
fix(world-boss): Need markModified
2015-01-19 22:36:10 -06:00
0a0a3f78cf
fix(world-boss): Desperation logic
2015-01-19 22:14:09 -06:00
3189ab92af
Wrote error message for when trying to send gems to self from balance
2015-01-19 22:13:21 -06:00
3ee965d8d2
feat(world-boss): Desperation move
2015-01-19 21:48:58 -06:00
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
bb78b121da
revert part of a053486, angular is madeningly inconsistent with this bug
2015-01-18 16:38:31 -07:00
a053486fcd
fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x
...
bug. Also, anon wasn't able to view avatar shares!
2015-01-18 14:51:40 -07:00
e25472759a
Added triad bingo achievment
2015-01-16 16:43:48 -06:00
7860819ee3
Added shell for awarding triad bingo
2015-01-16 12:27:51 -06:00
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
Blade Barringer