Commit Graph

422 Commits

Author SHA1 Message Date
Blade Barringer 887aa478ec chore: merge in develop 2016-04-15 10:11:54 -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 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
Matteo Pagliazzi d85c64705e Merge branch 'develop' into api-v3 2016-03-03 21:15:16 +01:00
Blade Barringer 0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Sabe Jones 078100aac8 chore(logging): output active handles per 10 minutes 2016-03-01 16:46:38 -05: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 4dfb24af6e enable newrelic 2016-02-21 22:02:37 +01:00
Matteo Pagliazzi 2ed2fb5d06 tests for user data export 2016-02-20 10:46:11 +01:00
Matteo Pagliazzi a6db8e693f refactor dataexport controller 2016-02-19 12:13:48 +01:00
Matteo Pagliazzi 0084a0d057 move tests to gulp tasks 2016-01-29 19:09:19 +01:00
Matteo Pagliazzi b1848da8de do not output server logs when testing, ability to run tests and server separately 2016-01-29 14:43:14 +01:00
Matteo Pagliazzi e345fa76f5 failing unit test 2016-01-29 12:07:46 +01:00
Matteo Pagliazzi 4518d3693c add exportChallengeCsv route (missing tests) 2016-01-27 20:28:54 +01:00
Matteo Pagliazzi 198d2e6ab5 misc fixes and run gulp lint when testing 2016-01-24 12:38:20 +01:00
Matteo Pagliazzi 13693a041a fix npm test so that it does not fail - temporary solution 2016-01-23 19:44:55 +01:00
Blade Barringer 32a2b3121e Merge branch 'develop' into api-v3 2016-01-18 18:04:07 -06:00
Kristian Tashkov 5b740b1a11 Fix setting of environment variables in gulp test tasks in Windows
See this stackoverflow link for why this is necessary
http://stackoverflow.com/questions/27084392/code-coverage-for-mocha-in-windows-7/27193866#27193866
2016-01-18 16:55:15 -06:00
Blade Barringer 64c4f0f94a Merge branch 'develop' into api-v3 2016-01-18 11:24:34 -06:00
Blade Barringer 79f2dc6b1a tests: Update gulp task to use npm scripts 2016-01-18 11:10:22 -06:00
Blade Barringer 37916271e8 Merge branch 'develop' into api-v3 2016-01-02 22:29:03 -06:00