Commit Graph

14099 Commits

Author SHA1 Message Date
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
Keith Holliday 6e732a67c9 Added initial challenge model tests 2016-02-28 14:44:18 -06:00
Christopher Giroir 7e845962f4 Fixing comments 2016-02-28 11:58:39 -08:00
Brian Murray 8d7c46d79f Merge branch 'develop' into use-level-style-in-modals 2016-02-28 10:13:10 -08: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
Andrew Cham 518532efdc #6779 Update community-guidelines.jade with current date 2016-02-28 01:20:31 -08: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
Andrew Cham bf64c6503d #6779 Update community guidelines 2016-02-27 02:47:58 -08:00
Alys cc5f794f3d prevent party inviter's email address being used as a Reply-To 2016-02-27 18:48:41 +10:00
Martin Colwell 93410c4f7a issue(6774): add support for markdown blockquote 2016-02-26 20:07:12 -05: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
Brian Murray c107e42978 Change userLevelStyle to a root scope so it can be used in modals. 2016-02-25 15:59:04 -08: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
Phillip Thelen 668ad6ff45 change imrovementCategories to array; 2016-02-24 15:57:08 +01: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
Kaitlin Hipkin 8c444e8a62 Merge pull request #1 from HabitRPG/develop
update my fork
2016-02-23 14:25:07 -05:00
Christopher Giroir 47688bfed5 Moving to a specific commit of smart-app-banner 2016-02-22 22:57:37 -08:00
Matteo Pagliazzi 2b8846b803 Merge pull request #6748 from TheHollidayInn/api-v3-unsubscribe
Added unsubscribe route and initial tests
2016-02-22 18:03:05 +01:00
Keith Holliday d60ff421c9 Updated route to be named /emails/unsubscribe and other minor fixes 2016-02-22 09:03:21 -06:00
Matteo Pagliazzi 68a57bc2f6 enable strict mode to allow use of let, const without babel 2016-02-22 11:45:26 +01:00
Matteo Pagliazzi 9ef4b6409e Merge branch 'develop' into api-v3 and move new relic to new location 2016-02-22 11:43:35 +01: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
Keith Holliday 34b03934cc Added unsubscribe route and initial tests 2016-02-21 10:05:51 -06:00