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
af4f51857b
Changed models to use common instead of shared
2015-01-25 15:10: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
07fec4a205
Merge branch 'mountmaster' into bailey-20150120
2015-01-20 10:30:40 -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
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
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
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
2b20c52a8d
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-10 09:25:18 -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
19fc403b2f
Clarified comments in user model
2015-01-02 15:26:16 -06: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
edf66cbb59
feat(discount) google discount & use sub.key instead of sub.months
2014-12-30 20:05:07 -07:00
b4975bb8a4
Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting
...
Conflicts:
public/js/controllers/headerCtrl.js
views/options/social/group.jade
2014-12-30 12:57:32 -06: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
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
84db289957
Merge branch 'develop' into add-flag-to-chat
2014-12-23 10:07:42 -06:00
492260d74a
refactor(coupons): coupons cleanup using async.auto
2014-12-20 17:58:00 -07: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
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
6fb531234d
Added flagCount variable
2014-12-11 13:00:25 -06:00
cea2879539
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster
2014-12-11 08:15:18 -06:00
ae6e0255c6
feat(flag-message): add server methods
2014-12-07 14:35:09 +01:00
e49e8f5765
Added note for paglias
2014-12-07 13:50:47 +01:00
a2cf14324c
Added a flags key to message object
2014-12-07 13:50:46 +01:00
5fd805db88
feat(plans): consectuive-month subscription perks (gifting)
2014-12-03 14:17:07 -07:00
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
Blade Barringer