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

11943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
6beca69ef6 Use docker-compose.cypress.yml in backend 2019-02-26 12:18:25 +01:00
Robert Schäfer
706fccc733 Fix Cypress with a dedicated docker-compose.yml 2019-02-26 12:16:27 +01:00
Grzegorz Leoniec
a04608b175
Merge branch 'master' into extract-styleguide 2019-02-26 08:35:20 +01:00
Grzegorz Leoniec
5d4824c86f
Use new styleguide npm package 2019-02-26 08:34:30 +01:00
dependabot[bot]
7075d32c8d
Bump @babel/core from 7.3.3 to 7.3.4 
Bumps [@babel/core](https://github.com/babel/babel) from 7.3.3 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.3...v7.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-26 04:36:35 +00:00
Robert Schäfer
351d8f9f95 Quickfix missing dependencies on Travis 2019-02-26 02:30:41 +01:00
Robert Schäfer
b7b96dd0fe Put yarn run test:cypress in background 2019-02-26 01:21:39 +01:00
Robert Schäfer
9e5ed087da Start seeder server backend for fullstack testing 2019-02-26 01:05:05 +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
8d43a32220
Merge pull request #190 from Human-Connection/use_factories_in_cucumber_features 
[WIP] Use factories in cucumber features
 2019-02-26 00:47:11 +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
a14a819420 Remove TODOs 2019-02-26 00:25:32 +01:00
Robert Schäfer
7c629ed4f0 Configure Travis to use factories for cypress 2019-02-26 00:25:32 +01:00
Robert Schäfer
250c70991a All cucumber tests pass on my machine 2019-02-26 00:25:32 +01:00
Robert Schäfer
cf898d5417 Report feature uses factories 2019-02-26 00:25:32 +01:00
Robert Schäfer
cec78c1954 Add instructions to configure cypress for neo4j 
@appinteractive probably you missed these changes
 2019-02-26 00:25:32 +01:00
Grzegorz Leoniec
459b582fb4 Fixed some linting issues 2019-02-26 00:25:32 +01:00
Robert Schäfer
1e219934d2 Obsolete cypress command 2019-02-26 00:25:31 +01:00
Robert Schäfer
233c6abbab Refactor most of report cucumber feature 2019-02-26 00:25:31 +01:00
Robert Schäfer
5e0d245b40 Implemented most cucumber features with factories 2019-02-26 00:25:31 +01:00
Robert Schäfer
a024282f75 Implement first cucumber features with factories 2019-02-26 00:25:31 +01:00
Armin
f74a45379f Integrate ActivityPub into the Backend 2019-02-25 23:57:44 +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
Wolfgang Huß
fc0ab69918 Merge branch 'editor' of https://github.com/Human-Connection/Nitro-Backend 2019-02-25 13:45:39 +01:00
Grzegorz Leoniec
9401e89d89
Update README.md 2019-02-25 08:53:53 +01:00
Grzegorz Leoniec
8fb94a12dd
Merge branch 'master' into editor 2019-02-24 17:17:02 +01:00
Grzegorz Leoniec
0a4f07cc90
Fixed readme 2019-02-24 17:06:08 +01:00
Grzegorz Leoniec
bc6089dbf5
Fixed readme 2019-02-24 17:05:59 +01:00
Grzegorz Leoniec
79c6553585
Update README.md 2019-02-24 17:02:44 +01:00
Grzegorz Leoniec
3c84f6956d
Update README.md 2019-02-24 17:02:06 +01:00
Grzegorz Leoniec
03c1d532b4
Merge pull request #192 from Human-Connection/fix-build 
Added IntersectionObserver polyfill and fixed linting on login
 2019-02-24 16:14:35 +01:00
Grzegorz Leoniec
bcb6dcfacf
Added IntersectionObserver polyfill and fixed linting on login 2019-02-24 15:26:25 +01:00
Grzegorz Leoniec
be9332071d
Added more badges to readme 2019-02-24 15:11:40 +01:00
Grzegorz Leoniec
5a255db018
Fixed FOSSA status 2019-02-24 15:08:00 +01:00
Grzegorz Leoniec
56610d0d3d
Fixed FOSSA status 2019-02-24 15:07:41 +01:00
Grzegorz Leoniec
fd0ac65f6a
Fixed FOSSA status 2019-02-24 15:04:16 +01:00
Grzegorz Leoniec
95dbba3369
Added more badges to readme 2019-02-24 15:02:05 +01:00
dependabot[bot]
0053f78f94
Bump eslint from 5.13.0 to 5.14.1 
Bumps [eslint](https://github.com/eslint/eslint) from 5.13.0 to 5.14.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.13.0...v5.14.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-22 20:27:35 +00:00
Robert Schäfer
6b66b33d8b Revert "Bump neo4j-graphql-js from 2.3.1 to 2.4.0" 
This reverts commit d8af7cb2e57b4623baa719c181899f4d72f7b185.

@appinteractive this broke the index page on the frontend side. If you
log in, you don't see posts and instead you see this error on the developer
console:

```
GraphQL error: Invalid input '}': expected whitespace, comment or a property key name (line 4, column 39 (offset: 464))
"RETURN COUNT(r)", {this: post_author, }, false),shoutedCount: apoc.cypher.runFirstColumn("MATCH (this)-[:SHOUTED]->(r:Post) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)", {this: post_author, }, false),commentsCount: apoc.cypher.runFirstColumn("MATCH (this)-[:WROTE]->(r:Comment) WHERE NOT r.deleted = true RETURN COUNT(r)", {this: post_author, }, false),followedByCount: apoc.cypher.runFirstColumn("MATCH (this)<-[:FOLLOWS]-(r:User) RETURN COUNT(r)", {this: post_author, }, false),location: head([ post_author_location IN apoc.cypher.runFirstColumn("MATCH (this)-[:IS_IN]->(l:Location) RETURN l", {this: post_author, }, true) | post_author_location { .nameEN }]) ,badges: [(`post_author`)<-[:`REWARDED`]-(`post_author_badges`:`Badge`) | post_author_badges { .id , .key , .icon }] }]) ,commentsCount: apoc.cypher.runFirstColumn("MATCH (this)<-[:COMMENTS]-(r:Comment) RETURN COUNT(r)", {this: post, }, false),categories: [(`post`)-[:`CATEGORIZED`]->(`post_categories`:`Category`) | post_categories { .id , .name , .icon }] ,shoutedCount: apoc.cypher.runFirstColumn("MATCH (this)<-[:SHOUTED]-(r:User) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)", {this: post, }, false)} AS `post` SKIP $offset LIMIT $first"
```
 2019-02-22 21:21:58 +01:00
Robert Schäfer
c86658729e Merge remote-tracking branch 'origin/master' into editor 2019-02-22 18:05:42 +01:00
Robert Schäfer
ed5e206dc6
Merge pull request #171 from Human-Connection/123-unit-test-for-report-mutation 
[WIP] Start unit testing report feature
 2019-02-22 17:58:44 +01:00
Robert Schäfer
c58d2ce403
Merge branch 'master' into 123-unit-test-for-report-mutation 2019-02-22 17:36:24 +01:00
dependabot[bot]
d4916323b0
Merge pull request #174 from Human-Connection/dependabot/npm_and_yarn/slug-1.0.0 2019-02-22 16:17:41 +00:00
Robert Schäfer
2e7e0579e4 Fix bug with id middleware 
Ids are queried only for well known queries and mutations
 2019-02-22 16:11:07 +01:00
Robert Schäfer
889818cd2d Expose bug in Query { isLoggedin } 
The idMiddleware was adding selection fields to the resolveInfo even if
the selection fields were empty. This caused a bug for each resolve
function including

```
{
 isLoggedin
}
```

which does not have any additional curly braces after the query.
 2019-02-22 15:21:23 +01:00
Robert Schäfer
5856e74b39 Fix yarn run db:reset 2019-02-22 14:13:03 +01:00
dependabot[bot]
55395a2ffc
Bump slug from 0.9.3 to 1.0.0 
Bumps [slug](https://github.com/Trott/node-slug) from 0.9.3 to 1.0.0.
- [Release notes](https://github.com/Trott/node-slug/releases)
- [Commits](https://github.com/Trott/node-slug/compare/v0.9.3...v1.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-22 04:17:49 +00:00
Matt Rider
4a43583c6b Create abusive-user to report, PR review suggestions 2019-02-21 22:43:51 -03:00