Commit Graph

12161 Commits

Author SHA1 Message Date
Blade Barringer a007effddd chore(i18n): update locales 2016-03-05 07:46:08 -06:00
Alys 9517920de6 fix error in nodemon command for running API tests individually 2016-03-05 15:51:54 +10: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 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
Sabe Jones ea983179a4 Merge pull request #6804 from HabitRPG/sabrecat/active-handles
Active handles logging
2016-03-03 13:55:14 -06: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
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 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 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
Alys 3464914655 Revert "remove common/script/src"
This reverts commit 7c5572608f.
2016-03-01 05:30:44 +10: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
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
Alys cc5f794f3d prevent party inviter's email address being used as a Reply-To 2016-02-27 18:48:41 +10: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
Matteo Pagliazzi d3e1a415a8 require newrelic as the first thing on startup 2016-02-21 22:39:55 +01:00
Matteo Pagliazzi f4d66c7384 config newrelic 2016-02-21 22:30:25 +01:00
Matteo Pagliazzi 4dfb24af6e enable newrelic 2016-02-21 22:02:37 +01:00
Brian Murray 45a938c12d put the atrribute allocation td building in a loop to clean up the code per Alys 2016-02-19 21:46:23 -08:00
Brian Murray 04d0bcadb7 in profile.jade in the character build section display detailed info about the attribute 2016-02-19 19:22:05 -08:00