Commit graph

440 commits

Author SHA1 Message Date
Matteo Pagliazzi
95aff08de3 v3 fix tests and use coroutines instead of regenerator 2016-05-11 15:59:18 +02:00
Matteo Pagliazzi
cee7700a50 switch from Q to Bluebird 2016-05-11 14:34:01 +02:00
Matteo Pagliazzi
299ed624f5 v3: upgrade some deps 2016-05-11 13:48:39 +02:00
Matteo Pagliazzi
f46b336a1f v3: fix package.json 2016-05-11 01:33:49 +02:00
Matteo Pagliazzi
17e763db37 v3: fix package.json 2016-05-11 01:32:55 +02:00
Blade Barringer
7d41b76b2e Merge pull request #7148 from crookedneighbor/require-again
feat: Add require-again to help with unit testing
2016-05-06 12:20:19 -05:00
Blade Barringer
192488cb02 feat: Add require-again to help with unit testing 2016-05-06 12:05:06 -05:00
Matteo Pagliazzi
f0e696b0ec Merge branch 'develop' into api-v3 2016-05-02 00:24:50 +02:00
Matteo Pagliazzi
a0e63c0eb2 use uuid module for uuids 2016-05-01 15:01:00 +02:00
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Blade Barringer
ad57dedecb refactor: Swap out remarkable for habitica flavored markdown-it 2016-04-25 07:36:02 -05:00
Matteo Pagliazzi
2d87cb0d87 Merge branch 'develop' into api-v3 2016-04-22 17:43:48 +02:00
Sabe Jones
867146dc19 fix(xss): Update site to use remarkable instead of marked
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
Blade Barringer
887aa478ec chore: merge in develop 2016-04-15 10:11:54 -05:00
Blade Barringer
10936d9a4d chore: Switch to custom eslint-config 2016-04-15 09:03:59 -05:00
Matteo Pagliazzi
11b5c1b405 v3: several fixes to class system, move /logout outside of api 2016-04-14 20:05:30 +02:00
Matteo Pagliazzi
7562a589c5 apidoc: update urls and add notice about private api 2016-04-14 16:02:28 +02:00
Matteo Pagliazzi
7de93cdd12 apidoc: change url to testing heroku app 2016-04-12 18:43:20 +02:00
Blade Barringer
83850d7a0c feat: build api doc after prod build 2016-04-11 17:34:44 -05:00
Matteo Pagliazzi
910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Blade Barringer
8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -05:00
Blade Barringer
1bc1968f3a chore: Upgrade winston dependency and remove unused modules 2016-04-08 17:35:03 -05:00
Blade Barringer
3a63896e40 chore: Upgrade dependencies to v3 versions 2016-04-08 17:35:03 -05:00
Blade Barringer
3250d9d064 chore: Remove unused qs dependency 2016-04-08 17:35:03 -05:00
Blade Barringer
46681d9a1a chore: Update nodemailer to v1 2016-04-08 17:35:03 -05:00
Blade Barringer
74dace9b5a chore: Re-enable New Relic
closes #7011
2016-04-05 20:08:31 -05:00
Matteo Pagliazzi
382e391fd0 port updateTask, addTask, clearCompleted, taskDefaults, uuid 2016-04-04 17:18:42 +02:00
Blade Barringer
02a60d90d8 Merge branch 'develop' into api-v3 2016-03-28 16:02:04 -05:00
Blade Barringer
f4b43f55f0 refactor: Remove express-csv dependency 2016-03-28 10:24:29 -05:00
Blade Barringer
cb5a79b1bf chore: Set express session options 2016-03-28 10:24:01 -05:00
Blade Barringer
41b961004a chore: upgrade express to version 4 2016-03-28 10:24:00 -05:00
Matteo Pagliazzi
d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Blade Barringer
ef2a1f5929 chore: Update pageres
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
2016-03-23 08:16:39 -05:00
Matteo Pagliazzi
0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Matteo Pagliazzi
3db06c6537 Merge branch 'develop' into api-v3 2016-03-15 19:23:23 +01:00
Matteo Pagliazzi
490c6a9ae1 wip(shared): port sleep op 2016-03-15 16:33:44 +01:00
Matteo Pagliazzi
fdeddc8631 pin stripe to specific version 2016-03-14 18:30:10 +01:00
Blade Barringer
17d2efb822 refactor: Organize protractor setup 2016-03-13 16:41:57 -05:00
Matteo Pagliazzi
8e3284a4e3 wip(shared): adapt to v3 2016-03-13 22:26:32 +01:00
Blade Barringer
0b65292e4b test: Update protractor to v3 and use mocha 2016-03-13 09:51:01 -05:00
Matteo Pagliazzi
fbdbd8e006 Merge branch 'develop' into api-v3 2016-03-10 18:30:09 +01:00
Blade Barringer
3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Matteo Pagliazzi
b5e1cd33e2 Merge branch 'develop' into api-v3 2016-03-05 19:29:02 +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
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