Commit graph

380 commits

Author SHA1 Message Date
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
Blade Barringer
c06d87b98b lint: Add babel rules to .eslintrc 2016-01-02 18:25:30 -06:00
Blade Barringer
bce049a316 Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2015-12-29 08:06:22 -06:00
Blade Barringer
773bb23b88 chore(dependency): Remove unneeded lodash submodules 2015-12-29 07:45:13 -06:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Blade Barringer
d53ac4c66f tests: Add ability to use ES2015 in karma tests 2015-12-28 08:24:23 -06:00
Michel Felipe de Oliveira Ferreira
11bbf165b1 Added explicitly phantomjs dependency 2015-12-16 16:47:17 -03:00
Matteo Pagliazzi
94fc1c9bef baseModel: delete properties instead of setting them to undefined, transform toJSON only not toObject 2015-11-25 15:19:21 +01:00
Matteo Pagliazzi
2dfca76a5e Merge pull request #6256 from HabitRPG/api-v3-apidoc
API v3 - apidoc wip
2015-11-18 17:12:14 +01:00
Matteo Pagliazzi
6fb4fdfd8a create apidoc task in grunt, update package.json version 2015-11-18 11:50:55 +01:00
Blade Barringer
08c4ec5557 Merge branch 'develop' into api-v3 2015-11-17 23:15:15 -06:00
Blade Barringer
553548046f Add linting for tests 2015-11-17 23:14:49 -06:00
Blade Barringer
49fd6b9f5c Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2015-11-15 14:59:57 -06:00
Blade Barringer
00055ad055 Merge branch 'develop' into api-v3 2015-11-15 14:57:41 -06:00
Blade Barringer
f7c88478bc Explicitly bump ampitude version 2015-11-15 10:48:46 -06:00
Blade Barringer
a127bb8711 Switch to babel-core form babel.
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
Blade Barringer
01946b64e6 Remove coffeescript from dependencies. 2015-11-15 08:29:54 -06:00
Blade Barringer
6c5afb9369 Downgrade to babelify v6. (v7 uses babel v6) 2015-11-15 08:10:07 -06:00
Matteo Pagliazzi
b315d10c79 migrate utils to v3, uprade nodemailer 2015-11-14 17:43:56 +01:00
Blade Barringer
6e8e1648d9 Merge branch 'develop' into api-v3 2015-11-13 07:38:24 -06:00
Blade Barringer
7559f14f4d Remove coffee from files 2015-11-11 20:40:26 -06:00
Blade Barringer
25ae2e4252 Move browserify task to gulp 2015-11-11 20:32:17 -06:00
Blade Barringer
cdb05e1b42 Add analytics service to v3 2015-11-11 17:30:36 -06:00
Blade Barringer
c91c3f78ed Remove lodash.defaultsDeep dependency 2015-11-11 06:44:45 -06:00
Matteo Pagliazzi
249037b80f upgrade some deps, and remove unused qs module 2015-11-11 12:12:44 +01:00
Matteo Pagliazzi
8864508482 rewrite server.js in es6 2015-11-11 11:58:15 +01:00
Matteo Pagliazzi
3795b1d151 wip: starts upgrading lodash to v3 2015-11-11 10:32:49 +01:00
Blade Barringer
d6764d4f37 Merge branch 'develop' into api-v3 2015-11-09 12:52:25 -06:00
Blade Barringer
6b7a757459 Run tests in sequence 2015-11-09 12:47:56 -06:00
Matteo Pagliazzi
7dd6eb76c9 add express-validator, add body parser middleware, support some more errors in error handler middleware 2015-11-08 22:48:31 +01:00
Blade Barringer
58cf34af9d Merge branch 'develop' into api-v3 2015-11-07 21:06:37 -06:00
Blade Barringer
598d25dc48 Update browserify package 2015-11-07 20:56:56 -06:00
Blade Barringer
a6c7e3b885 Update protractor dependency 2015-11-07 20:31:28 -06:00
Blade Barringer
05ae419d7e Update karma dependencies and remove unused packages. 2015-11-07 19:56:09 -06:00
Blade Barringer
88f8a2a375 Swap out gulp-clean for rimraf 2015-11-07 19:09:51 -06:00
Blade Barringer
18328c0c42 Add lodash.deepDefaults as a dependency 2015-11-06 21:27:38 -06:00
Matteo Pagliazzi
3135613be3 tweaks eslint rules, fixes gulp-eslint, adds some comments 2015-11-04 18:50:08 +01:00
Matteo Pagliazzi
cbca250b99 remove winston-mail and winston-newrelic from deps as they may not be compatible with v2 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
5e73bc9f1c adds logger and starts logging errors 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
b21df9edb3 use node 4, npm 3, mongoose 4 and express 4 2015-11-04 18:26:38 +01:00
Blade Barringer
003524a19b Update npm 2015-10-30 10:28:10 -05:00
Matteo Pagliazzi
75e85c085d fix typo in package.json 2015-10-30 14:18:14 +01:00
Matteo Pagliazzi
0131ba3e45 reert all the deps upgrades 2015-10-30 14:16:35 +01:00