sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13416 commits 3 branches 0 tags 1.6 GiB
Commit graph

437 commits

Author SHA1 Message Date
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
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
Matteo Pagliazzi
715dd28e24 chore(newrelic): upgrade to ~1.23.0 2015-10-30 11:51:18 +01:00
Matteo Pagliazzi
2097004676 chore(node): upgrade to ^4.2.1 2015-10-30 10:44:13 +01:00
Matteo Pagliazzi
4051cdf06d add requirejs to devDeps as it is a required peerDependency 2015-10-29 19:56:50 +01:00
Matteo Pagliazzi
e813b756ac use higher npm version 2015-10-29 17:26:35 +01:00
Matteo Pagliazzi
37d83fdade mongoo 4 and new travis ci infrastructure 2015-10-29 16:35:02 +01:00
Matteo Pagliazzi
8ea69e90dd enable new relic, node 4 and npm 3 2015-10-29 16:11:56 +01:00
Matteo Pagliazzi
f9ab04e4f9 upgrade to express 4.x 
cleanup package.json

put errorHandler middleware as the last one

use accepts module instead of req.acceptedLanguages

use normal object notation as it is supported is es5

remove deprecations from auth controller

remove deprecations from groups controller

Revert "remove deprecations from groups controller"

This reverts commit 7cf36295ebbc50c1f2b210a8ab447d7f2c41dba9.

Revert "remove deprecations from auth controller"

This reverts commit deecd701e0551862ba53ea894f2d87a746384fed.

request limit upped to 1mb and 10k chars for query parameters

Upgrade to Express 4.x
 2015-10-29 15:59:45 +01:00
Blade Barringer
a7c52e6086 Reinstate amplitude analytics 2015-10-27 19:37:57 -05:00
Blade Barringer
01914523e1 Remove dependency on chai-shallow-deep-equal 2015-10-25 12:50:14 -05:00
Blade Barringer
829b1253fb Revert nodemon change for tests and log errors if they arise 2015-10-25 11:10:10 -05:00
Blade Barringer
7fe2a19bc5 Adjust start server task to use nodemon to recover from syntax errors 2015-10-25 09:54:09 -05:00
Blade Barringer
f98c6b7192 Add chai-shallow-deep-equal plugin 2015-10-25 09:40:23 -05:00
Blade Barringer
661d070b56 Add additional tests for register route 2015-10-24 22:28:04 -05:00
Blade Barringer
a0547b99ca Update dependencies 2015-10-24 20:14:48 -05:00
Blade Barringer
a0e7eef956 Fix legacy tests 2015-10-20 20:17:10 -05:00
Blade Barringer
75f63b1367 Add functionality to generate user to update user 2015-10-17 19:19:40 -05:00
Blade Barringer
5291d1a4e9 Add test for registering a user 2015-10-17 18:13:38 -05:00
Blade Barringer
aa9be8cb1a Update superagent 2015-10-17 11:46:57 -05:00
Blade Barringer
6ed417842f Move gulp-babel to dependency 2015-09-30 19:55:20 -05:00
Blade Barringer
d1faa50e5e Merge branch 'develop' into refactor-content 2015-09-28 07:52:02 -05:00
Blade Barringer
1616b237fa Revert npm bin commit 
Vagrant installs don't use the .bin directory because Virtualbox has issues with symlinks see https://github.com/HabitRPG/habitrpg/issues/4591#issuecomment-72344790
 2015-09-27 22:54:01 -05:00
Blade Barringer
c21802e7e7 Merge branch 'develop' into refactor-content 2015-09-25 12:22:11 -05:00
Matteo Pagliazzi
5ac46716a3 add eslint tasks to gulp, remove .jshintrc 2015-09-25 15:44:45 +02:00
Blade Barringer
a4f0d96606 Move backgrounds to module 2015-09-19 21:12:09 -05:00
Blade Barringer
85a16b62e5 Add babel task and move to src directory 2015-09-17 17:42:53 -05:00
Blade Barringer
f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only 
Adjustments to group quest behavior
 2015-09-15 18:57:32 -05:00
Tim PILLARD
6a96a2910e Ensure NPM scripts always use local binary 2015-09-16 00:19:19 +02:00
Blade Barringer
6aa04aa6fb Add another dev dep to deps 2015-09-15 10:57:18 -05:00
Blade Barringer
41afe0a2f5 Add another dev dep to deps 2015-09-15 10:49:28 -05:00
Blade Barringer
76bd6cbd59 Move some dev dependencies to normal dependencies 2015-09-15 10:38:48 -05:00
Blade Barringer
d3d365a74a Move sprites task to gulp 2015-09-11 19:59:06 -05:00
Blade Barringer
bd1ae09749 Simplify scripts (node scripts use ./node_modules version of things by default) 2015-09-09 09:04:10 -05:00
Blade Barringer
a85116540c Move run:dev task to gulp 2015-09-08 15:45:09 -05:00
Blade Barringer
1e29020df9 Add marked to packagejson 2015-09-06 19:44:55 -05:00
Matteo Pagliazzi
db0a73d332 add router to get firebase token for user 2015-09-05 16:21:46 +02:00
Matteo Pagliazzi
f5f19d146e start adding firebase 2015-09-05 15:44:45 +02:00
Blade Barringer
c8c9d6c892 Set different gulp tasks for production use 2015-09-04 15:53:07 -05:00
Blade Barringer
7aae3d6aa9 Move gulp-grunt to regular dependency 2015-09-04 15:44:18 -05:00
Blade Barringer
3434a13782 Move glob to normal dependencies 2015-09-04 15:40:57 -05:00
Blade Barringer
cfae45a5f7 Move build task to gulp 2015-09-04 15:30:44 -05:00
Blade Barringer
0f5f80f910 Unpend preening test 2015-08-19 19:23:23 -05:00
Matteo Pagliazzi
078ea4768a upgrade jade version 2015-08-14 10:58:19 +02:00
Blade Barringer
054d884154 Merge branch 'develop' into analytics-service-server-side 2015-07-19 10:13:34 -05:00