 Matteo Pagliazzi
|
8920b05f9e
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
|
2016-03-02 12:59:51 +01:00 |
|
|
Matteo Pagliazzi
|
5b012750bb
|
convert spells to es6
|
2016-03-02 12:46:06 +01:00 |
|
|
Alys
|
f69a29c152
|
improve group invitation code and tests
|
2016-03-02 09:26:55 +10:00 |
|
|
Sabe Jones
|
2516eae8d3
|
Merge pull request #6799 from HabitRPG/sabrecat/armoire-201603
Armoire and BGs 2016-03
|
2016-03-01 15:34:50 -06:00 |
|
|
Sabe Jones
|
ea6abbfabc
|
feat(content): Armoire and BGs 2016-03
|
2016-03-01 15:59:25 -05:00 |
|
|
Blade Barringer
|
ae56dd5c2e
|
Merge pull request #6796 from crookedneighbor/refactor_remove_unused_common_src_files
refactor: Remove unused common script src files
|
2016-03-01 09:21:58 -06:00 |
|
|
Blade Barringer
|
c96ddaeebe
|
refactor: Remove unused common script src files
|
2016-03-01 08:49:25 -06:00 |
|
|
Matteo Pagliazzi
|
9114d74357
|
Merge branch 'develop' into api-v3
|
2016-03-01 09:44:57 +01:00 |
|
|
Matteo Pagliazzi
|
531d3969f4
|
fix cluster.fork
|
2016-03-01 09:15:13 +01:00 |
|
|
Alys
|
01b12cd8b4
|
Merge pull request #6793 from Sinble/develop
Change Menu Names
|
2016-03-01 15:43:27 +10:00 |
|
|
Nick Bunn
|
b6255e9240
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into menu_name_change
|
2016-02-29 20:23:24 -06:00 |
|
|
Nick Bunn
|
251dd3cb8e
|
Changed submenu from Hall of Heroes to Hall of Contributors
|
2016-02-29 20:23:05 -06:00 |
|
|
Matteo Pagliazzi
|
25471b3f81
|
Merge pull request #6792 from HabitRPG/api-v3-tmp-filters
[API v3] add support for user._tmp, disable user.filters since it is not used
|
2016-03-01 00:09:34 +01:00 |
|
|
Matteo Pagliazzi
|
e5224a7b2a
|
add support for user._tmp, disable user.filters since it is not used
|
2016-02-29 23:20:13 +01:00 |
|
|
Alys
|
3464914655
|
Revert "remove common/script/src"
This reverts commit 7c5572608f.
|
2016-03-01 05:30:44 +10:00 |
|
|
Matteo Pagliazzi
|
a04bf4c045
|
use different i18n module for tests
|
2016-02-29 17:07:33 +01:00 |
|
|
Matteo Pagliazzi
|
0c700cc36d
|
Merge branch 'develop' into api-v3
|
2016-02-29 16:39:31 +01:00 |
|
|
Matteo Pagliazzi
|
7c5572608f
|
remove common/script/src
|
2016-02-29 16:35:35 +01:00 |
|
|
Matteo Pagliazzi
|
cbb29eac55
|
update gitignore for elastic beanstalk
|
2016-02-29 16:28:08 +01:00 |
|
|
Josh Holland
|
fae0bbc8f6
|
Add Moonstone Chain quest art
|
2016-02-28 19:37:07 -06:00 |
|
|
Matteo Pagliazzi
|
03c3beba0e
|
Merge pull request #6788 from HabitRPG/api-v3-model-paths
[Api v3] Models paths
|
2016-02-29 01:12:55 +01:00 |
|
|
Matteo Pagliazzi
|
3512233966
|
add meta/models controller to get public models paths
|
2016-02-29 01:04:19 +01:00 |
|
|
Nick Bunn
|
075ed9f172
|
updated menu names for better description
|
2016-02-28 16:10:26 -06:00 |
|
|
Josh Holland
|
e2ca21f935
|
Add Message in a Bottle quest art
|
2016-02-28 17:12:57 +00:00 |
|
|
Alys
|
6cd861dcdc
|
Merge pull request #6742 from murraybd/develop
Display attribute info in Character Build
|
2016-02-28 19:39:20 +10:00 |
|
|
Alys
|
c8b5cf95be
|
Merge pull request #6764 from querry43/add-missing-docker-depends
adding two deps to dockerfile required for karma
|
2016-02-28 19:11:01 +10:00 |
|
|
Alys
|
ccfff7270f
|
Merge pull request #6763 from querry43/tests-in-docker
TEST_DB_URI env override
|
2016-02-28 19:04:58 +10:00 |
|
|
Alys
|
91fc6186e5
|
Merge pull request #6736 from delftswa2016/fix-perks-buygems
Fixed perk amounts when buying subscription through gem
|
2016-02-28 18:32:39 +10:00 |
|
|
Matteo Pagliazzi
|
5e68589ac8
|
check for membership when leaving public guild, fix memberCount update when leaving group, add missing files
|
2016-02-28 01:11:45 +01:00 |
|
|
Matteo Pagliazzi
|
733da70b48
|
getFirebaseToken route
|
2016-02-27 18:31:28 +01:00 |
|
|
Matteo Pagliazzi
|
3284bb2384
|
add logout
|
2016-02-27 18:18:56 +01:00 |
|
|
Matteo Pagliazzi
|
84810ae758
|
Merge pull request #6778 from HabitRPG/api-v3-session-invite
[API v3] Refactor session invite (no more session!)
|
2016-02-27 18:07:39 +01:00 |
|
|
Matteo Pagliazzi
|
9321a2d904
|
remove checks for emails
|
2016-02-27 17:58:56 +01:00 |
|
|
Matteo Pagliazzi
|
6c8da9a53a
|
fix user schema definition and add missing schema
|
2016-02-27 17:46:00 +01:00 |
|
|
Matteo Pagliazzi
|
432d27fab2
|
better default values for user schema
|
2016-02-27 12:40:24 +01:00 |
|
|
Matteo Pagliazzi
|
b4f7625d93
|
Merge branch 'develop' into api-v3-session-invite
|
2016-02-27 12:04:39 +01:00 |
|
|
Matteo Pagliazzi
|
b4e4e31be5
|
fix invitations and add missing tests
|
2016-02-27 12:01:00 +01:00 |
|
|
Alys
|
cc5f794f3d
|
prevent party inviter's email address being used as a Reply-To
|
2016-02-27 18:48:41 +10:00 |
|
|
Matteo Pagliazzi
|
0014afb75e
|
add tests for req.query.groupInvite
|
2016-02-26 19:43:17 +01:00 |
|
|
Matteo Pagliazzi
|
d2ba8e223c
|
remove session party invitation. Implement the same feature using a query string when signing up
|
2016-02-26 19:18:18 +01:00 |
|
|
Matteo Pagliazzi
|
bb461f0c5a
|
Merge branch 'develop' into api-v3
|
2016-02-26 10:08:24 +01:00 |
|
|
Matteo Pagliazzi
|
82c4f91317
|
put newrelic behind a flag
|
2016-02-25 21:05:42 +01:00 |
|
|
Sabe Jones
|
bf002a2d1e
|
chore(news): add bang
|
2016-02-25 14:06:06 -05:00 |
|
|
Sabe Jones
|
3270cbf89f
|
fix(events): revert missed sprite and quest availability
|
2016-02-24 19:49:17 -05:00 |
|
|
Matt Harrington
|
46e13fecad
|
TEST_DB_URI env override
|
2016-02-25 00:08:24 +00:00 |
|
|
Sabe Jones
|
d2a487aea1
|
Merge pull request #6761 from HabitRPG/sabrecat/mystery-201602
Mystery Items 201602
|
2016-02-24 17:01:18 -06:00 |
|
|
Sabe Jones
|
86824c5304
|
fix(news): add byline
|
2016-02-24 17:25:49 -05:00 |
|
|
Sabe Jones
|
ca57fad0b9
|
feat(time-travel): add Phoenixes
Also adds Bailey news for the above and the subscriber set.
|
2016-02-24 17:23:42 -05:00 |
|
|
Matt Harrington
|
f129df2e03
|
adding two deps required for karma
|
2016-02-24 05:22:31 +00:00 |
|
|
Sabe Jones
|
5c1d379f41
|
feat(subscription): mystery items 201602
|
2016-02-23 17:00:55 -05:00 |
|