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
13,067 Commits 5 Branches 2 Tags
Commit Graph

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Rider
c575565f8c Copy plugins from builder 2019-01-03 21:06:28 -02: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
Matt Rider
e88b674a29 Configure docker-compose, travis multistage build 2019-01-03 20:22:46 -02:00
Matt Rider
5778ef3bc0 Multistage build docker 2019-01-03 19:25:20 -02: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
6cc6538758
Add forgotten schema file 2019-01-03 17:30:18 +01:00
Grzegorz Leoniec
626d1ada48
Merge branch 'master' into 49_fix_no_user_with_that_email 2019-01-03 17:27:42 +01:00
Grzegorz Leoniec
32d2b6f92e
Merge branch 'master' into report-content 2019-01-03 15:32:06 +01:00
Grzegorz Leoniec
588d955677
Merge remote-tracking branch 'origin/master' into report-content 2019-01-03 15:27:40 +01:00
Grzegorz Leoniec
5c88037d5c
WIP - first try to create a report mutation which attaches nodes internally 2019-01-03 15:27:26 +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]
6c5812c863
Bump vuex-i18n from 1.10.9 to 1.11.0 
Bumps [vuex-i18n](https://github.com/dkfbasel/vuex-i18n) from 1.10.9 to 1.11.0.
- [Release notes](https://github.com/dkfbasel/vuex-i18n/releases)
- [Commits](https://github.com/dkfbasel/vuex-i18n/compare/v1.10.9...v1.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 07:36:46 +00:00
dependabot[bot]
d7f9769e68
Merge pull request #113 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-vue-5.1.0 2019-01-03 07:31:42 +00: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]
b5f1688fb8
Bump eslint-plugin-vue from 5.0.0 to 5.1.0 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v5.0.0...v5.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 06:55:48 +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]
3f6ca51c11
Merge pull request #112 from Human-Connection/dependabot/npm_and_yarn/cookie-universal-nuxt-2.0.12 2019-01-03 06:49:19 +00:00
dependabot[bot]
9b7695d937
Bump cookie-universal-nuxt from 2.0.11 to 2.0.12 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.11 to 2.0.12.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.11...v2.0.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 04:46:22 +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
dependabot[bot]
385a0f43a2
Merge pull request #96 from Human-Connection/dependabot/submodules/Nitro-Backend-a625118 2019-01-03 04:16:51 +00:00
dependabot[bot]
7d4bb9f099
Bump Nitro-Backend from 7593a09 to a625118 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `7593a09` to `a625118`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](7593a094e0...a6251183c6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-03 04:16:32 +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
35c8536d9b
Merge branch 'master' into locations 2019-01-02 13:57:34 +01:00
Grzegorz Leoniec
27cd718342
Merge branch 'master' into 49_fix_no_user_with_that_email 2019-01-02 13:55:53 +01:00
Grzegorz Leoniec
9de15879f3
Merge branch 'master' into i18n-pluralization 2019-01-02 13:50:20 +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