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
324 Commits 5 Branches 2 Tags
Commit Graph

324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daksh
d0e18bf131
Merge branch 'master' into master 2019-01-07 23:12:15 +05:30
dependabot[bot]
a1b8d53e6e
Merge pull request #87 from Human-Connection/dependabot/npm_and_yarn/apollo-client-2.4.8 2019-01-07 16:20:09 +00:00
dependabot[bot]
b6511b9a03
Bump apollo-client from 2.4.7 to 2.4.8 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.4.7 to 2.4.8.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-07 16:06:35 +00:00
Robert Schäfer
a6c6dcbedf
Merge pull request #100 from aonomike/master 
Update README.md
 2019-01-07 17:00:53 +01:00
Robert Schäfer
1d7988e36f
Merge branch 'master' into master 2019-01-07 17:00:33 +01:00
Daksh
016119e768
fix variableName from id to userId 2019-01-07 13:00:19 +05:30
Daksh Miglani
5fd5795f39
fix jwt strategy 2019-01-07 12:48:47 +05:30
Mike Aono
486e01ddce
Update README.md 2019-01-05 18:57:24 +03:00
Robert Schäfer
3d3b3c8c24
Merge pull request #93 from Gerald1614/500_error_on_login 
FIX #49 capture error in readable format with try and catch
 2019-01-04 00:35:23 +01:00
Robert Schäfer
fd206c2b1f Merge remote-tracking branch 'origin/master' into 500_error_on_login 2019-01-04 00:25:22 +01:00
Robert Schäfer
407e5bfdeb
Merge pull request #88 from Human-Connection/49_fix_no_user_with_that_email 
Login: Friendly error message if email is incorrect
 2019-01-04 00:22:33 +01:00
Robert Schäfer
96d9bb49bc Revert "add afterAll to make CI pass" 
This reverts commit 3a9cb31e1f6039aecd428b2fc250b4b88a18ccfa.

See https://github.com/Human-Connection/Nitro-Backend/pull/88#discussion_r245157595
 2019-01-03 23:55:05 +01:00
kachulio1
e1070e15f2 add done on async test 2019-01-03 22:03:23 +03:00
kachulio1
3a9cb31e1f add afterAll to make CI pass 2019-01-03 20:40:28 +03:00
Grzegorz Leoniec
a7206c6e07
Merge branch 'master' into 500_error_on_login 2019-01-03 17:30:56 +01: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
Gerald Michelant
4f4b6e5469 changed method to inject variable to login 2019-01-02 14:33:35 -05:00
Gerald Michelant
da1860bcd0 rewritting of login method 2019-01-02 14:33:35 -05:00
Gerald Michelant
57d9088c6c throw new AuthenticationError on password error 2019-01-02 14:33:35 -05:00
Gerald Michelant
0b623cf083 capture error in readable format with try and catch 2019-01-02 14:33:35 -05:00
dependabot[bot]
1bd5b2a8d8 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 14:32:49 -05:00
dependabot[bot]
e9ec677527 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 14:32:49 -05:00
dependabot[bot]
b787b639c7 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>
 2019-01-02 14:32:49 -05: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