IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-18 19:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,287 Commits 5 Branches 2 Tags
Commit Graph

10287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
00d1ca0129 Put CMD in base section in Dockerfile 
This should fix our build server. Probably the container immediately
exited on Travis which is using the `builder` stage for testing.
 2019-01-04 19:52:52 +01:00
Robert Schäfer
9b3161ae15 Fix copy+paste error backend=>webapp 
@mattwr18 ouch, that was a hard to spot error. It struck my eye when I
was switching back and forth between `docker-compose.override.yml` and
`docker-compose.travis.yml`.
 2019-01-04 19:18:53 +01:00
Matt Rider
b8fb1bd1c0 Revert docker-compose up command in travis.yml 2019-01-04 15:15:06 -02:00
Matt Rider
014392a7a5 Add missing up in docker-compose up 2019-01-04 15:06:59 -02: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
f1392e47c5
disabled autocomplete on select 2019-01-04 15:03:52 +01:00
Grzegorz Leoniec
47c858d9d2
Improved locale handling 2019-01-04 15:03:35 +01:00
Grzegorz Leoniec
d1f0131e0e
Moved JWT_TOKEN and MAPBOX_TOKEN to .env 2019-01-04 14:59:23 +01:00
Grzegorz Leoniec
8b5c59d39a
try to fix memory leak 2019-01-04 14:50:55 +01:00
Grzegorz Leoniec
6e22dde22c
Merge branch 'master' into locations 2019-01-04 09:31:50 +01:00
Grzegorz Leoniec
1f818116e4
Merge branch 'master' into locations 2019-01-04 09:30:20 +01:00
dependabot[bot]
1da5e1a419
Merge pull request #98 from Human-Connection/dependabot/submodules/Nitro-Web-d7f9769 2019-01-04 04:40:46 +00:00
dependabot[bot]
6f60f91852
Merge pull request #97 from Human-Connection/dependabot/submodules/Nitro-Backend-3d3b3c8 2019-01-04 04:40:42 +00:00
dependabot[bot]
907c64862b
Bump Nitro-Web from a3171d3 to d7f9769 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `a3171d3` to `d7f9769`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](a3171d3449...d7f9769e68)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-04 04:40:20 +00:00
dependabot[bot]
12ce15ef0f
Bump Nitro-Backend from a625118 to 3d3b3c8 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `a625118` to `3d3b3c8`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](a6251183c6...3d3b3c8c24)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-04 04:40:19 +00:00
Matt Rider
744362a4d7 Link docker-compose to docker-compose.travis 2019-01-03 22:37:48 -02: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
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