 Matteo Pagliazzi
|
45e7609dd1
|
Merge branch 'piousbox-api-v3-email-3' into api-v3
|
2016-03-05 19:24:22 +01:00 |
|
|
Matteo Pagliazzi
|
6830a4464a
|
Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3
|
2016-03-05 19:24:11 +01:00 |
|
|
Matteo Pagliazzi
|
a266ffdabd
|
Merge pull request #6821 from HabitRPG/upgrade_babel_v3
Upgrade babel v3
|
2016-03-05 19:07:34 +01:00 |
|
|
Matteo Pagliazzi
|
863ca9954e
|
errors working with babel 6, export v3 shared modules in main common module
|
2016-03-05 18:58:40 +01:00 |
|
|
Victor Piousbox
|
7dfdbb8b05
|
/user/update-email endpoint
|
2016-03-04 21:27:16 +00:00 |
|
|
Blade Barringer
|
b97511db31
|
fix: Use module.exports instead of export default
|
2016-03-04 13:29:51 -06:00 |
|
|
Blade Barringer
|
4cd0428f0a
|
Merge branch 'develop' into api-v3
|
2016-03-04 12:16:22 -06:00 |
|
|
Blade Barringer
|
511b003ec5
|
Merge pull request #6811 from crookedneighbor/upgrade_babel
chore: upgrade babel to v6
|
2016-03-04 08:36:08 -06:00 |
|
|
Blade Barringer
|
9447a6ce10
|
feat: pre-compile babel when used in production
|
2016-03-04 07:44:22 -06:00 |
|
|
Blade Barringer
|
99242ac60f
|
fix: remove dependency that was causing build to fail
|
2016-03-03 22:24:55 -06:00 |
|
|
Blade Barringer
|
7f4beb747f
|
Merge branch 'develop' into api-v3
|
2016-03-03 21:24:54 -06:00 |
|
|
Blade Barringer
|
b61cfefc30
|
fix: fix issue where build would fail but exit as if oy passed
|
2016-03-03 21:05:06 -06:00 |
|
|
Blade Barringer
|
8c6d8163bc
|
refactor: adjust path to cron module in common code
|
2016-03-03 18:09:07 -06:00 |
|
|
Matteo Pagliazzi
|
d85c64705e
|
Merge branch 'develop' into api-v3
|
2016-03-03 21:15:16 +01:00 |
|
|
Matteo Pagliazzi
|
ba4d969751
|
Merge pull request #6802 from HabitRPG/api-v3-cast-2
[Api v3] Cast
|
2016-03-03 21:06:47 +01:00 |
|
|
Sabe Jones
|
ea983179a4
|
Merge pull request #6804 from HabitRPG/sabrecat/active-handles
Active handles logging
|
2016-03-03 13:55:14 -06:00 |
|
|
Matteo Pagliazzi
|
96c582e062
|
fix tests, move most errors to shared code
|
2016-03-03 19:16:03 +01:00 |
|
|
Blade Barringer
|
0406142e0e
|
chore: upgrade babel to v6
|
2016-03-02 21:36:27 -06:00 |
|
|
Alys
|
c3107ad3fb
|
improve commenting style
|
2016-03-03 13:35:55 +10:00 |
|
|
Matteo Pagliazzi
|
80f791c86b
|
add tests, move CustomError to common, fix casting
|
2016-03-03 00:16:28 +01:00 |
|
|
Alys
|
56e53cc95f
|
fix Burst of Flames / fireball skill - was doing too much boss damage; add human-friendly names to skills for ease of searching
|
2016-03-03 08:30:49 +10:00 |
|
|
Sabe Jones
|
af38e83e36
|
fix(logging): don't log without env var
|
2016-03-02 11:30:49 -05:00 |
|
|
Sabe Jones
|
c761944c35
|
feat(logging): timestamp active handles output
|
2016-03-02 10:22:46 -05:00 |
|
|
Matteo Pagliazzi
|
05b6e25c28
|
port spells to api-v3
|
2016-03-02 13:05:17 +01:00 |
|
|
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
|
a698559c04
|
fix(log-handles): don't log verbose code
|
2016-03-01 16:46:39 -05:00 |
|
|
Sabe Jones
|
bff5258a56
|
fix(logging): get interval from env var
|
2016-03-01 16:46:39 -05:00 |
|
|
Sabe Jones
|
078100aac8
|
chore(logging): output active handles per 10 minutes
|
2016-03-01 16:46:38 -05: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 |
|