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

406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grzegorz Leoniec
df1706a1ae
Merge pull request #109 from Human-Connection/106_authorization 
106 authorization
 2019-01-21 13:22:39 +01:00
Robert Schäfer
89326bd856
Merge branch 'master' into 106_authorization 2019-01-18 19:50:37 +01:00
dependabot[bot]
361a41bd4e
Merge pull request #118 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.4.0 2019-01-18 09:16:22 +00:00
dependabot[bot]
a9d271ca47
Bump apollo-cache-inmemory from 1.3.12 to 1.4.0 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.3.12 to 1.4.0.
- [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/v1.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 09:00:09 +00:00
dependabot[bot]
530fc6b230
Merge pull request #114 from Human-Connection/dependabot/npm_and_yarn/graphql-yoga-1.17.0 2019-01-18 08:57:38 +00:00
dependabot[bot]
dfd2550cf8
Bump graphql-yoga from 1.16.7 to 1.17.0 
Bumps [graphql-yoga](https://github.com/prisma/graphql-yoga) from 1.16.7 to 1.17.0.
- [Release notes](https://github.com/prisma/graphql-yoga/releases)
- [Commits](https://github.com/prisma/graphql-yoga/compare/v1.16.7...v1.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 08:23:32 +00:00
dependabot[bot]
5678c205eb
Merge pull request #117 from Human-Connection/dependabot/npm_and_yarn/apollo-client-2.4.9 2019-01-18 08:19:47 +00:00
dependabot[bot]
097a4c1b8f
Bump apollo-client from 2.4.8 to 2.4.9 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.4.8 to 2.4.9.
- [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-18 07:59:43 +00:00
dependabot[bot]
839a01bb3b
Merge pull request #119 from Human-Connection/dependabot/npm_and_yarn/graphql-tag-2.10.1 2019-01-18 07:57:22 +00:00
dependabot[bot]
4618c1d8be
Bump graphql-tag from 2.10.0 to 2.10.1 
Bumps [graphql-tag](https://github.com/apollostack/graphql-tag) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/apollostack/graphql-tag/releases)
- [Changelog](https://github.com/apollographql/graphql-tag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollostack/graphql-tag/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 04:19:45 +00:00
Robert Schäfer
65124067f3 Merge remote-tracking branch 'origin/master' into 106_authorization 2019-01-18 02:17:20 +01:00
Robert Schäfer
c1395f7ec1 Fix leakage of subprocesses 
@mattwr18 and I could not find any other way how to prevent leftover
processes than using a complex list of npm scripts.

Watch: http://youtu.be/byovuFwNXiw
and see how we despearately try to fix this stupid problem.
 2019-01-18 02:09:19 +01:00
Robert Schäfer
5dbe5b16a4 Help @mattwr18 to debug the subprocesses 2019-01-17 23:38:55 +01:00
dependabot[bot]
8b8caaef40
Merge pull request #103 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-node-8.0.1 2019-01-17 20:39:38 +00:00
dependabot[bot]
b9e348d2d3
Bump eslint-plugin-node from 8.0.0 to 8.0.1 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v8.0.0...v8.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-17 20:19:53 +00:00
dependabot[bot]
4f88e7e38f
Merge pull request #102 from Human-Connection/dependabot/npm_and_yarn/eslint-5.12.0 2019-01-17 20:16:51 +00:00
dependabot[bot]
8e6299c804
Bump eslint from 5.11.1 to 5.12.0 
Bumps [eslint](https://github.com/eslint/eslint) from 5.11.1 to 5.12.0.
- [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.11.1...v5.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-17 20:06:56 +00:00
dependabot[bot]
f90e041049
Merge pull request #116 from Human-Connection/dependabot/npm_and_yarn/supertest-3.4.1 2019-01-17 20:04:42 +00:00
Robert Schäfer
47e9e52a84 Refactor test to be less confusing 2019-01-17 18:31:39 +01:00
Robert Schäfer
918bd863ed Fix typo 
Replace password with Asterix and Obelix
See: http://www.topkool.com/fr/wp-content/uploads/2012/10/asterix-et-obelix-017.jpg

@appinteractive 😆
 2019-01-17 18:06:53 +01:00
Robert Schäfer
6340efbfc5 Fix #106 
Thank you @appinteractive ! 💝

FYI: @kachulio1 @mattwr18
 2019-01-17 18:03:28 +01:00
Robert Schäfer
a5c87e0cd5 Add --ci on Travis (it's our ci server 😄) 2019-01-17 18:03:05 +01:00
Robert Schäfer
ad8e64d060 Properly exit if seeding fails 2019-01-17 16:01:03 +01:00
Robert Schäfer
cd3f0955f9 Properly test 106 
I had the wrong test setup for the "expected-to-be-green" side tests
(for debugging).
 2019-01-17 15:42:09 +01:00
Robert Schäfer
d50015af3c Replace node with babel-node 
This should ensure that you don't have to reubild the server all the
time
 2019-01-17 15:24:25 +01:00
Robert Schäfer
9e4edca35b Use node spawn to spin off several servers 2019-01-17 15:17:18 +01:00
dependabot[bot]
541e44e04c
Bump supertest from 3.3.0 to 3.4.1 
Bumps [supertest](https://github.com/visionmedia/supertest) from 3.3.0 to 3.4.1.
- [Release notes](https://github.com/visionmedia/supertest/releases)
- [Changelog](https://github.com/visionmedia/supertest/blob/master/History.md)
- [Commits](https://github.com/visionmedia/supertest/compare/v3.3.0...v3.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-17 04:31:44 +00:00
Robert Schäfer
a07f48826b Merge remote-tracking branch 'origin/master' into 106_authorization 2019-01-15 19:59:52 +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
b2d1685b06 WIP: Integrate permissionless app into setup hooks 2019-01-15 00:39:06 +01:00
Robert Schäfer
9d541d8f27 Clean up helper.js 2019-01-14 23:31:00 +01:00
Robert Schäfer
6f487e2687 Fix non-deterministic erros in testing 
Without the `--runInBand` flag, jest will create a worker pool of child
processes and run the tests withing. No surprise, why the tests were
running completely non-deterministically! If we clear the database in
the middle of the tests we will end up with no records, or if we run the
factories in several tests we end up with many duplicate records.

FYI: @mattwr18 @appinteractive @tansaku @Kachulio1
 2019-01-14 23:22:12 +01:00
Robert Schäfer
70b20302fe Probably exposed #106 2019-01-14 23:00:21 +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
Robert Schäfer
d0b975e782 Getting strange non-deterministic errors 2019-01-14 20:54:11 +01:00
Grzegorz Leoniec
79749e6570
Fixed isOwner permission 2019-01-14 17:07:20 +01:00
Robert Schäfer
6bbc76911a Refactor test cases 2019-01-14 16:07:52 +01:00
Grzegorz Leoniec
3a90c84a21
Merge branch 'master' into locations 2019-01-13 15:43:37 +01:00
Grzegorz Leoniec
fb885ddcda
Merge branch 'master' into 106_authorization 2019-01-13 15:42:21 +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