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

379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
887a6d201f Import contributions to neo4j 2019-01-18 23:53:00 +01:00
Robert Schäfer
97e6acf46b Import of all users in one script: 
```sh
docker-compose exec neo4j import/import.sh
```
 2019-01-18 22:45:29 +01:00
Robert Schäfer
4534f1ae9e Add production server to known_hosts 2019-01-18 21:18:59 +01:00
Robert Schäfer
f0c18e2cca Clean up Dockerfile, add known_hosts file 
@appinteractive it's troublesome to add the SSH private key via
environment variable. You have to convert newlines to spaces and convert
them back - which I think is error prone. I hope we can transfer the
private key file on to our deployed container later on.
 2019-01-18 21:07:24 +01:00
Robert Schäfer
bfad621306 Disable automatic know-hosts for now 
This will require user interaction when running the import script
 2019-01-16 02:19:02 +01:00
Robert Schäfer
8d8dfb0640 Provision neo4j container with import script 2019-01-16 02:10:42 +01:00
Robert Schäfer
433cd7a52e Export all relevant collection to a shared folder 2019-01-16 02:10:42 +01:00
Robert Schäfer
1c04b8f3de Import mongodb on-the-fly 2019-01-16 02:10:42 +01:00
Robert Schäfer
0970014a59 Create db-migration-worker as a docker container 
The idea is to import/dump the remote database via SSH, restore it to
the local mongodb, export .json collections to a shared volume and
import the json collections with cypher-shell.
 2019-01-16 02:10:42 +01:00
Robert Schäfer
57a6b259eb Copy remote-dump.sh as a starting piont 
Just added the two environment variables for neo4j.
 2019-01-16 02:10:42 +01:00
Robert Schäfer
1ecdcb19b5
Merge pull request #16 from Human-Connection/locations 
Locations & About Me
 2019-01-15 13:24:24 +01:00
Robert Schäfer
5e77e7eaa7
Merge branch 'master' into locations 2019-01-15 13:18:31 +01:00
Robert Schäfer
9e28704d9b Fix all cypress tests but one 
@appinteractive, it's super strange but apparently the JWT has to be
enclosed in quotes whereas the MAPBOX_TOKEN must not be enclosed. This
commit fixes almost all tests running in the docker containers on my
machine. The remaining test case is:
```
About me and and location
I set my location to "Mecklenburg-Vorpommern" (example #2)
```

@appinteractive when I try to repeat the cypress test on my machine I
get no results for "Mecklenburg-Vorpommern" only cities and states. can
you check if regions really work?
 2019-01-15 01:29:38 +01:00
Robert Schäfer
75ee9bf9b4 Fix seed data in docker environment 
@appinteractive

Running
```
docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up
```
from the Nitro-Web folder gives me an error when running seed data.

The configuration in this commit fixes it on my machine. I guess that
will fix the frontend build, too.
 2019-01-14 21:50:42 +01:00
Grzegorz Leoniec
79749e6570
Fixed isOwner permission 2019-01-14 17:07:20 +01:00
Grzegorz Leoniec
3a90c84a21
Merge branch 'master' into locations 2019-01-13 15:43:37 +01:00
Grzegorz Leoniec
617a62a40c
Merge pull request #104 from DakshMiglani/master 
fix #41 jwt strategy
 2019-01-13 15:41:15 +01:00
dependabot[bot]
9d284da73e
Merge pull request #85 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.3.12 2019-01-12 21:09:49 +00:00
dependabot[bot]
53044c4cf6
Bump apollo-cache-inmemory from 1.3.11 to 1.3.12 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.3.11 to 1.3.12.
- [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-12 20:51:19 +00:00
dependabot[bot]
a27363632c
Merge pull request #110 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-jest-22.1.3 2019-01-12 20:48:39 +00:00
Grzegorz Leoniec
aa9cfceba9
Try to fix build issues 2019-01-12 15:50:51 +01:00
Robert Schäfer
f4f69cfe0f Quote JWT Token (consistency) 2019-01-11 17:59:06 +01:00
Robert Schäfer
fb3c169f65 Add missing env variable to docker-compose.yml 
@appinteractive always run the docker-compose up workflow at least once.
 2019-01-11 14:29:56 +01:00
Daksh
ca38892322
remove password from query. 2019-01-10 21:49:01 +05:30
Grzegorz Leoniec
5970fc86e5
Merge branch 'locations' of github.com:appinteractive/hc-prototype-api into locations 2019-01-10 15:59:17 +01:00
Grzegorz Leoniec
887cc8fddf
Refactoring 2019-01-10 15:59:10 +01:00
Grzegorz Leoniec
1435b3cd25
Merge branch 'master' into locations 2019-01-10 15:57:23 +01:00
dependabot[bot]
da19dee1f2
Bump eslint-plugin-jest from 22.1.2 to 22.1.3 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.1.2 to 22.1.3.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.1.2...v22.1.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-10 04:19:47 +00:00
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
Daksh
fbdbabc382
Merge branch 'master' into master 2019-01-09 19:08:37 +05:30
Robert Schäfer
b2bad4fedb
Merge pull request #108 from Human-Connection/dont_run_tests_in_build_folder 
Don't run tests in /dist folder
 2019-01-09 14:35:29 +01:00
Robert Schäfer
13666df3e2 Don't run tests in /dist folder 
If you ran `yarn run build` followed by `yarn run test:jest` it was
running the tests twice, because it matched the `/dist` folder to.
 2019-01-09 13:50:59 +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
Robert Schäfer
2156b08e8f Run yarn run lint --fix 
@DakshMiglani check the build server for any errors:
https://travis-ci.com/Human-Connection/Nitro-Backend/builds/96505757#L658

Here you can see the build was fine, only eslint complained. Eslint is a
quick fix 😉
 2019-01-08 14:20:05 +01:00
Grzegorz Leoniec
a313f941c5
Fixed eslint issue 2019-01-07 20:25:05 +01:00
Daksh
d0e18bf131
Merge branch 'master' into master 2019-01-07 23:12:15 +05:30
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