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

644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
7700a34804 Merge remote-tracking branch 'origin/master' into 37-full-text-search-top-bar 2019-02-28 18:55:31 +01:00
Grzegorz Leoniec
086345cd35
Merge pull request #187 from Human-Connection/194_stop_decoding_jwt_on_frontend 
Implement currentUser query
 2019-02-28 14:33:12 +01:00
Grzegorz Leoniec
9427f3937f
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 12:23:55 +01:00
dependabot[bot]
6933657530
Merge pull request #184 from Human-Connection/dependabot/npm_and_yarn/@babel/preset-env-7.3.4 2019-02-28 09:40:06 +00:00
dependabot[bot]
57c24f62d1
Bump @babel/preset-env from 7.3.1 to 7.3.4 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.3.1 to 7.3.4.
- [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.3.1...v7.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 09:25:48 +00:00
dependabot[bot]
4152a2e393
Merge pull request #186 from Human-Connection/dependabot/npm_and_yarn/apollo-server-testing-2.4.8 2019-02-28 09:21:42 +00:00
Grzegorz Leoniec
a8b1a673d0
Merge remote-tracking branch 'origin/master' into 37-full-text-search-top-bar 2019-02-28 10:06:16 +01:00
dependabot[bot]
4b2ca9368b
Bump apollo-server-testing from 2.4.2 to 2.4.8 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.4.2 to 2.4.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.4.2...apollo-server-testing@2.4.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 08:58:00 +00:00
dependabot[bot]
e95d6d4ce3
Merge pull request #193 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.5.1 2019-02-28 08:52:22 +00:00
Grzegorz Leoniec
88e5f36f6c
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-28 09:49:15 +01:00
dependabot[bot]
e74962a2be
Bump apollo-cache-inmemory from 1.5.0 to 1.5.1 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.5.0 to 1.5.1.
- [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/compare/apollo-cache-inmemory@1.5.0...apollo-cache-inmemory@1.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-28 04:29:33 +00:00
dependabot[bot]
a3a8c9d7cb
Merge pull request #185 from Human-Connection/dependabot/npm_and_yarn/apollo-server-2.4.8 2019-02-27 23:10:59 +00:00
Matt Rider
8f382bc166 Merge branch '37-full-text-search-top-bar' of github.com:Human-Connection/Nitro-Backend into 37-full-text-search-top-bar 2019-02-27 19:34:53 -03:00
Matt Rider
671a713410 Merge branch 'master' of github.com:Human-Connection/Nitro-Backend into 37-full-text-search-top-bar 2019-02-27 19:24:41 -03:00
Grzegorz Leoniec
6a146aa699 Improved search query 2019-02-27 19:02:26 -03:00
Grzegorz Leoniec
360acdb141 Fix search 2019-02-27 19:02:26 -03:00
Robert Schäfer
e7c01d8877 Disable authentication on Travis 2019-02-27 19:02:26 -03:00
Robert Schäfer
8453d95f68 Do we need to wait until the web client is up? 2019-02-27 19:02:26 -03:00
Robert Schäfer
a41063a60a On Travis we have to expose the port 
...to be able to wait for it.
 2019-02-27 19:02:26 -03:00
Robert Schäfer
14c61b3bf8 Create indices before testing 2019-02-27 19:02:26 -03:00
Robert Schäfer
63845681b7 Fix lint 2019-02-27 19:02:26 -03:00
Robert Schäfer
5a995f9f86 Implement test for search 
@appinteractive could you have a look if sanitization of search queries
work? I created a test and I see "unterminated string" exceptions. This
is not what we want! All user input should be escaped.
 2019-02-27 19:01:23 -03:00
Robert Schäfer
5230099e6b Sketch a test 2019-02-27 18:56:23 -03:00
Robert Schäfer
151bb28429 Provide README 2019-02-27 18:56:23 -03:00
Robert Schäfer
34ecd07b1b Modify migrate for development environment 2019-02-27 18:56:23 -03:00
Robert Schäfer
46436ca9b1 Setup a routine how to create indices initially 
In order to create the indices programmatically we need to change the
default password for security concerns. To create the user we need to
start the neo4j database. So I decided to provide a bash script that
let us do it once the container are started.

In production we must change the NEO4J_PASSWORD.
 2019-02-27 18:56:23 -03:00
Grzegorz Leoniec
832a778ca1 Added findPost query 2019-02-27 18:53:27 -03:00
mattwr18
659a5d5ef8
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-27 18:07:23 -03:00
dependabot[bot]
85a702c8de
Bump apollo-server from 2.4.2 to 2.4.8 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.4.2 to 2.4.8.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.4.2...apollo-server@2.4.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-27 20:54:07 +00:00
dependabot[bot]
550eaff67c
Merge pull request #191 from Human-Connection/dependabot/npm_and_yarn/apollo-client-2.5.1 2019-02-27 20:50:13 +00:00
Robert Schäfer
da3cf86e25
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-27 20:43:53 +01:00
dependabot[bot]
100aad61e1
Bump apollo-client from 2.4.13 to 2.5.1 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.4.13 to 2.5.1.
- [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/compare/apollo-client@2.4.13...apollo-client@2.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-27 19:33:45 +00:00
dependabot[bot]
bdc796ac59
Merge pull request #190 from Human-Connection/dependabot/npm_and_yarn/apollo-cache-inmemory-1.5.0 2019-02-27 19:31:30 +00:00
Matt Rider
f9b60fa0b0 Fix lint 2019-02-27 08:10:20 -03:00
Robert Schäfer
5fd44230dd Get rid of LoggedInUser graphql type 
This was causing a lot of headache on the frontend. Now, there a single
source of truth. If you query `currentUser` you can overwrite your local
copy of the user and update the UI.
 2019-02-27 11:08:13 +01:00
dependabot[bot]
7a063d1707
Bump apollo-cache-inmemory from 1.4.3 to 1.5.0 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.4.3 to 1.5.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/compare/apollo-cache-inmemory@1.4.3...apollo-cache-inmemory@1.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-27 04:34:03 +00:00
mattwr18
ec185f13d4
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-26 16:14:00 -03:00
Robert Schäfer
673ca3a726
Merge pull request #165 from Human-Connection/dependabot/npm_and_yarn/eslint-5.14.1 
Bump eslint from 5.13.0 to 5.14.1
 2019-02-26 16:37:07 +01:00
Robert Schäfer
69bf53e05e Impplement currentUser query 
* remove dead code (passport-jwt)
* refactor resolves to have a separate folder
* currentUser and login have the same response
 2019-02-26 16:35:31 +01:00
Robert Schäfer
44f5ccac77
Merge branch 'master' into dependabot/npm_and_yarn/eslint-5.14.1 2019-02-26 16:15:38 +01:00
Robert Schäfer
691c0e86ef
Merge pull request #136 from Human-Connection/editor 
[WIP] Editor
 2019-02-26 16:14:30 +01:00
Robert Schäfer
33adf48caf
Merge branch 'master' into dependabot/npm_and_yarn/eslint-5.14.1 2019-02-26 12:52:27 +01:00
Robert Schäfer
706fccc733 Fix Cypress with a dedicated docker-compose.yml 2019-02-26 12:16:27 +01:00
Robert Schäfer
f94bb72fdb Merge remote-tracking branch 'origin/master' into editor 2019-02-26 00:52:38 +01:00
Robert Schäfer
c4f15e626d Fix lint and unblock port 4001 
We have to specify the `yarn run test:cypress` in `.travis.yml` in the
Nitro-Web repo.
 2019-02-26 00:46:14 +01:00
Robert Schäfer
ec2b1050bc Less redundancy and more consistency in factories 
* use the same `relate` method for now
* use a capital letter for the model `user` instead of `User`
 2019-02-25 21:28:30 +01:00
Robert Schäfer
bd264673bd Merge branch 'master' into editor 2019-02-25 19:34:48 +01:00
Robert Schäfer
aef367b210 Backend runs test- and seed-server on travis 
This is necessary for fullstack testing in the frontend repository
 2019-02-25 19:34:24 +01:00
Grzegorz Leoniec
bc6089dbf5
Fixed readme 2019-02-24 17:05:59 +01:00
Grzegorz Leoniec
5a255db018
Fixed FOSSA status 2019-02-24 15:08:00 +01:00