ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
344 Commits 117 Branches 1,511 Tags
Commit Graph

344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
ced8bd78bb
Added locations to seeded users 2019-01-09 17:21:30 +01:00
Grzegorz Leoniec
9629ca649a
Fixed user middleware 2019-01-09 17:20:25 +01:00
Grzegorz Leoniec
3765f5d046
Merge branch 'master' into locations 2019-01-09 13:37:04 +01:00
Grzegorz Leoniec
86c7b93386
Removed unneeded log 2019-01-09 13:14:18 +01:00
Grzegorz Leoniec
2571d82447
Disabled cypther logs and added DEBUG env var 2019-01-09 13:12:37 +01:00
dependabot[bot]
7798c9fafd
Merge pull request #107 from Human-Connection/dependabot/npm_and_yarn/neo4j-graphql-js-2.2.0 2019-01-09 08:42:08 +00:00
dependabot[bot]
1dd852ee9f
Bump neo4j-graphql-js from 2.1.1 to 2.2.0 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.1.1 to 2.2.0.
- [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-09 04:30:55 +00:00
Grzegorz Leoniec
0bfa047a5a
Fixed issues for non german / english languages 2019-01-08 15:12:44 +01:00
Robert Schäfer
ae39c18980 Run all backend tests 
I accidently left `describe.only` in the test suite. That usually runs
only one block of tests instead of all tests. My fault, sorry
 2019-01-08 14:57:33 +01:00
Grzegorz Leoniec
b5649ca2e3
Internationalized Locations 2019-01-08 14:34:00 +01:00
Grzegorz Leoniec
a313f941c5
Fixed eslint issue 2019-01-07 20:25:05 +01:00
Grzegorz Leoniec
cffce564ea
Fixed short_code 2019-01-07 17:58:27 +01:00
Grzegorz Leoniec
9fab4a8fe7
Fixed injection issues 2019-01-07 17:34:18 +01:00
Grzegorz Leoniec
77e77229b9
Fixed login and schema 2019-01-07 17:30:54 +01:00
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
Mike Aono
486e01ddce
Update README.md 2019-01-05 18:57:24 +03:00
Grzegorz Leoniec
30d4318d17
Throw an error if requried env vars are missing 2019-01-04 15:15:07 +01:00
Grzegorz Leoniec
e9bc848a33
Improved locale handling and moved MAPBOX_TOKEN to env 2019-01-04 15:14:51 +01:00
Grzegorz Leoniec
1f818116e4
Merge branch 'master' into locations 2019-01-04 09:30:20 +01: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
Grzegorz Leoniec
241e7287ba
Merge branch 'master' into locations 2019-01-03 13:23:35 +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