IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
303 Commits 5 Branches 2 Tags
Commit Graph

303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kachulio1
3a9cb31e1f add afterAll to make CI pass 2019-01-03 20:40:28 +03:00
Grzegorz Leoniec
626d1ada48
Merge branch 'master' into 49_fix_no_user_with_that_email 2019-01-03 17:27:42 +01:00
Robert Schäfer
d6622d0825 Revert "Setup neo4j service on Travis CI" 
This reverts commit 9fdee4480fea582a01e40687cffff404b749a8f1.

@mattwr18 this was a rash decision, neo4j on Travis is not required if
we run all the tests in docker. When I run the tests in docker on my
machine, it terminates as expected. How is the situation on your
machine?
 2019-01-03 13:53:44 +01:00
Robert Schäfer
9fdee4480f Setup neo4j service on Travis CI 2019-01-03 11:50:20 +01:00
dependabot[bot]
3452db3468
Merge pull request #98 from Human-Connection/dependabot/npm_and_yarn/neo4j-graphql-js-2.1.1 2019-01-03 07:19:18 +00:00
dependabot[bot]
7f567be64f
Bump neo4j-graphql-js from 2.0.1 to 2.1.1 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.0.1 to 2.1.1.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 06:55:44 +00:00
dependabot[bot]
6c93127e6e
Merge pull request #97 from Human-Connection/dependabot/npm_and_yarn/eslint-5.11.1 2019-01-03 06:50:48 +00:00
dependabot[bot]
363105281b
Bump eslint from 5.10.0 to 5.11.1 
Bumps [eslint](https://github.com/eslint/eslint) from 5.10.0 to 5.11.1.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v5.10.0...v5.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 04:33:35 +00:00
Robert Schäfer
d98a05a476 Fix eslint 2019-01-02 16:01:25 +01:00
Robert Schäfer
0185f743e8 Update README with a warning and fix package.json 2019-01-02 15:59:32 +01:00
Robert Schäfer
7634234afd Match error message in tests with production code 2019-01-02 15:16:01 +01:00
Robert Schäfer
ffafd72c79 Merge remote-tracking branch 'Gerald1614/500_error_on_login' into 49_fix_no_user_with_that_email 2019-01-02 15:09:13 +01:00
Robert Schäfer
ec5cebf90f DRY code with ES6 2019-01-02 14:56:55 +01:00
Robert Schäfer
70320f3c04 Undo mocks 2019-01-02 14:43:31 +01:00
Grzegorz Leoniec
b1987d7f1a
Merge branch 'master' into 500_error_on_login 2019-01-02 13:58:52 +01:00
Grzegorz Leoniec
27cd718342
Merge branch 'master' into 49_fix_no_user_with_that_email 2019-01-02 13:55:53 +01:00
Robert Schäfer
a0b42d9061 Properly reproduce #49 2019-01-02 13:38:51 +01:00
Robert Schäfer
23b454025a Implement user factory and database clean up 2019-01-02 13:14:28 +01:00
dependabot[bot]
a6251183c6
Merge pull request #90 from Human-Connection/dependabot/npm_and_yarn/@babel/preset-env-7.2.3 2019-01-02 11:22:40 +00:00
dependabot[bot]
3f6fa66bdd
Bump @babel/preset-env from 7.2.0 to 7.2.3 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.2.0 to 7.2.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-02 11:10:31 +00:00
dependabot[bot]
93392e0dd7
Merge pull request #91 from Human-Connection/dependabot/npm_and_yarn/@babel/cli-7.2.3 2019-01-02 11:07:28 +00:00
dependabot[bot]
42006c51bc
Bump @babel/cli from 7.2.0 to 7.2.3 
Bumps [@babel/cli](https://github.com/babel/babel) from 7.2.0 to 7.2.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-02 10:53:45 +00:00
Grzegorz Leoniec
f420708f70
Merge pull request #79 from Human-Connection/dependabot/npm_and_yarn/@babel/node-7.2.2 
Bump @babel/node from 7.2.0 to 7.2.2
 2019-01-02 11:51:30 +01:00
dependabot[bot]
9ff227d28f
Bump @babel/node from 7.2.0 to 7.2.2 
Bumps [@babel/node](https://github.com/babel/babel) from 7.2.0 to 7.2.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-31 19:19:28 +00:00
Gerald Michelant
2959eeb931 rewritting of login method 2018-12-30 16:44:08 -05:00
Gerald Michelant
1e949f3fde throw new AuthenticationError on password error 2018-12-28 22:17:28 -05:00
Gerald Michelant
93d821825b capture error in readable format with try and catch 2018-12-27 17:21:18 -05:00
Robert Schäfer
7593a094e0
Merge pull request #92 from Toverto/change-db-scripts 
Change db scripts to run nodemon instead of node
 2018-12-26 17:19:44 +01:00
Toverto
bd59f916b0
Remove the build instruction for seeding the db in README.md 2018-12-26 16:19:40 +01:00
Grzegorz Leoniec
469dd67447
Merge branch 'master' into 49_fix_no_user_with_that_email 2018-12-24 16:49:53 +01:00
Toverto
cd651b07fa
Change db scripts to run nodemon instead of node 
this way you don't have to run yarn run build before seeding the db
 2018-12-23 19:30:15 +01:00
Robert Schäfer
ec9c205bee Export a function in server.js and test teardown 2018-12-21 00:37:58 +01:00
Robert Schäfer
6b216be05c Add @mattwr18's code and fix linting 2018-12-21 00:03:57 +01:00
Grzegorz Leoniec
88341f5fce
Merge pull request #89 from Kachulio1/patch-1 
Update README.md
 2018-12-20 23:16:46 +01:00
kachulio1
e58e228f0c remove supertest 2018-12-20 22:44:52 +03:00
Joseph
01c4090792
Update README.md 
add build command before db:seed
 2018-12-20 22:18:18 +03:00
kachulio1
2ccbb1ca92 add supertest 2018-12-20 20:39:48 +03:00
Robert Schäfer
f15fb0bb1f Sketch a test to expose #49 2018-12-20 18:01:55 +01:00
Robert Schäfer
eaef67fad3 Replace mocha with jest 
To have a consisten test runner in both repos (Nitro-Web and
Nitro-Backend)
 2018-12-20 17:55:03 +01:00
Grzegorz Leoniec
f47b136232
Merge pull request #84 from Human-Connection/update_env_template 
Fix 'audience must be a string or array'
 2018-12-19 11:25:49 +01:00
Robert Schäfer
9eef9bc81c Fix 'audience must be a string or array' 
I ran into this issue after setting up the installation locally.
 2018-12-19 10:06:00 +01:00
Grzegorz Leoniec
618368cefe
Merge pull request #82 from Human-Connection/dependabot/npm_and_yarn/sanitize-html-1.20.0 
Bump sanitize-html from 1.19.3 to 1.20.0
 2018-12-18 16:25:54 +01:00
dependabot[bot]
acd1197ca1
Bump sanitize-html from 1.19.3 to 1.20.0 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.19.3 to 1.20.0.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/punkave/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/compare/1.19.3...1.20.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-18 04:20:24 +00:00
Grzegorz Leoniec
5f133a2d48
Merge pull request #81 from Human-Connection/dependabot/npm_and_yarn/apollo-link-http-1.5.9 
Bump apollo-link-http from 1.5.8 to 1.5.9
 2018-12-17 10:32:30 +01:00
Grzegorz Leoniec
082e305dbd
Merge pull request #78 from Human-Connection/dependabot/npm_and_yarn/nodemon-1.18.9 
Bump nodemon from 1.18.8 to 1.18.9
 2018-12-17 10:31:04 +01:00
dependabot[bot]
b8a89c9fac
Bump apollo-link-http from 1.5.8 to 1.5.9 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.8 to 1.5.9.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-17 04:41:28 +00:00
dependabot[bot]
cdda79fd2e
Bump nodemon from 1.18.8 to 1.18.9 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.18.8 to 1.18.9.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.18.8...v1.18.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-17 04:39:16 +00:00
Grzegorz Leoniec
1539d9ac91
Merge pull request #75 from Human-Connection/dependabot/npm_and_yarn/apollo-server-2.3.1 
Bump apollo-server from 2.2.6 to 2.3.1
 2018-12-16 18:27:42 +01:00
dependabot[bot]
f992a13632
Bump apollo-server from 2.2.6 to 2.3.1 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.2.6 to 2.3.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-16 17:17:38 +00:00
Grzegorz Leoniec
cf8ed1ceb3
Merge pull request #74 from Human-Connection/dependabot/npm_and_yarn/apollo-link-http-1.5.8 
Bump apollo-link-http from 1.5.7 to 1.5.8
 2018-12-16 18:12:38 +01:00