Commit Graph

2671 Commits

Author SHA1 Message Date
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
Martin Colwell
93410c4f7a issue(6774): add support for markdown blockquote 2016-02-26 20:07:12 -05: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
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
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
Matteo Pagliazzi
91be89e05a Merge pull request #6735 from HabitRPG/api-v3-dataexport
[API v3] Data export
2016-02-20 21:17:32 +01:00
Matteo Pagliazzi
62ebde3186 fix tests that require session authentication 2016-02-20 21:02:46 +01:00
Christopher Giroir
896773f9ef Adding android app banners
Fixes #6692
2016-02-20 11:56:39 -08: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
kogelnikp
00473dded7 fixed partially hidden button
added clearfix class to prevent floating for the next elements.
2016-02-19 22:17:39 +01:00
Matteo Pagliazzi
fbc944a5cc fix push notifications imports 2016-02-19 20:59:12 +01:00
Matteo Pagliazzi
fb343f8feb port push notifications in api v3 2016-02-19 20:34:55 +01:00
Matteo Pagliazzi
130110fed2 use correct path for v2 locals middleware 2016-02-19 19:44:43 +01:00
Matteo Pagliazzi
cc31d266e4 port locals middleware, add some tests and a lot of fixes 2016-02-19 18:42:03 +01:00
Matteo Pagliazzi
feadfbcd9e fix case when req.session is undefined and use correct syntax for authWithSession 2016-02-19 12:23:53 +01:00
Matteo Pagliazzi
192c57fa85 re-add removed code for dataexport.history 2016-02-19 12:16:09 +01:00
Matteo Pagliazzi
a6db8e693f refactor dataexport controller 2016-02-19 12:13:48 +01:00
kogelnikp
db595564b3 fixed perk amounts when buying subscription through gem
set SettingsCtrl as ng-controller for modal buy-gems window to show perk
amounts when buying subscriptions through gem button
2016-02-18 23:43:25 +01:00
Phillip Thelen
c751ee74c0 store which areas the user wants to improve in 2016-02-18 20:30:14 +01:00
Phillip Thelen
86181253c6 store reminders for tasks 2016-02-18 20:30:02 +01:00
Matteo Pagliazzi
d79e0f6e2e add tests for hall 2016-02-18 19:41:35 +01:00
Matteo Pagliazzi
2547676783 add hall controller, missing tests 2016-02-18 14:55:52 +01:00
Alys
3563244cdc change number of users from 1,000,000 to 1,100,000 2016-02-18 12:42:47 +10:00
Sabe Jones
bafdfc4ed5 chore(news): Bailey 20160217 2016-02-17 20:59:11 -05:00
Alys
ffb5cfd46e Merge pull request #6582 from tylerxo/remove_modal_username
Adds user details to the removal modal
2016-02-18 06:39:31 +10:00
Sabe Jones
f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Matteo Pagliazzi
28c6c27b78 Merge branch 'develop' into api-v3 2016-02-14 13:03:29 +01:00
Matteo Pagliazzi
8b7719d25e fix apidoc comments 2016-02-14 12:56:40 +01:00
Matteo Pagliazzi
e1b01e3853 Merge pull request #6565 from HabitRPG/sabrecat/quest-accept
WIP: Quests for API v3
2016-02-12 20:56:19 +01:00
Sabe Jones
b4b64dcf19 fix(performance): no chat notifs from big Guilds 2016-02-12 13:18:30 -05:00
Blade Barringer
4360f01936 feat(api-v3): Add force-start quest route 2016-02-12 08:09:16 -06:00
Sabe Jones
67929f3a96 fix(performance): don't send chat notifs for Newbies Guild 2016-02-11 21:29:32 -05:00