Commit Graph

12856 Commits

Author SHA1 Message Date
Matteo Pagliazzi ec13a34228 Merge pull request #6842 from TheHollidayInn/api-v3-challenge-tasks-get
Added initial get challenge task by id
2016-03-10 16:53:14 +01:00
Keith Holliday f96de74abd Added test for incorrect task and id and renamed test file 2016-03-09 10:01:16 -06:00
Blade Barringer 3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Matteo Pagliazzi 582ded4494 disable rate limiting middleware 2016-03-08 23:21:11 +01:00
Sabe Jones f5ea9c5524 fix(analytics): don't log chat messages 2016-03-08 15:19:39 -05:00
Blade Barringer 842d031d5b Merge pull request #6828 from HabitRPG/upgrade_node
chore: Upgrade node
2016-03-08 13:09:59 -06:00
Keith Holliday 22e64bb88e Added initial get challenge task by id 2016-03-08 12:42:05 -06:00
Blade Barringer 155cd6c626 fix: Correct how faq module is exported 2016-03-08 11:59:45 -06:00
Alys 76799eee05 Merge pull request #6837 from zesme/fix-tavern-tier-1-icon
Changed tavern tier 1 text icon
2016-03-08 20:26:46 +10:00
Lucas Torroba d502db71e5 Changed tavern tier 1 text icon
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
2016-03-08 03:05:46 -03:00
Alys 34057c375b Merge pull request #6819 from zesme/develop
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
2016-03-06 20:28:47 +10:00
Alys 87bd55cca1 Merge pull request #6780 from colwem/issue6774
Improve styling of markdown blockquotes - fixes #6774
2016-03-06 19:59:30 +10:00
Alys e59f614568 Merge pull request #6786 from murraybd/use-level-style-in-modals
Use level style in modals
2016-03-06 18:52:21 +10:00
Alys 9cac8dd95e Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740
Fixed partially hidden button in chat box
2016-03-06 18:18:02 +10:00
Alys 612d455fe1 Merge pull request #6782 from andrewcham/issue6779
update community guidelines - fixes #6779
2016-03-06 17:42:08 +10:00
Matteo Pagliazzi b5e1cd33e2 Merge branch 'develop' into api-v3 2016-03-05 19:29:02 +01:00
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
Blade Barringer d82dd67930 chore: Upgrade node 2016-03-05 09:17:31 -06:00
Blade Barringer b553a6c134 fix: Remove active handles (incompatible with node v4) 2016-03-05 08:11:21 -06:00
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
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
Lucas Torroba 4f4ea8416c Closed issue #6758
After some discussion on the thread, this is probably the neatest
solution to issue #6758. I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
2016-03-04 13:16:37 -03: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