ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-04-26 15:57:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
824 Commits 150 Branches 1,897 Tags
Commit Graph

824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Armin
14a57d1ebf Refactoring + fixes 2019-02-27 15:44:01 +01:00
Armin
b76de03e28 ActivityPub now also usable standalone 2019-02-27 15:24:51 +01:00
Armin
25eef848f6 Fetch actorObject and lookup inbox before sending object + addCommentAuthor 2019-02-27 15:06:30 +01: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
Armin
adb674b98d Handle update, like, dislike and accept activities and also sending activities through the ActivityPub protocol + refactoring 2019-02-27 02:43:48 +01:00
Armin
e48ce8a94e Test fixes + add remove from outbox collection step 2019-02-27 02:34:44 +01:00
mattwr18
ec185f13d4
Merge branch 'master' into 194_stop_decoding_jwt_on_frontend 2019-02-26 16:14:00 -03:00
Armin
9e5b6865b8 Create and send Post via ActivityPub inbox of the server 2019-02-26 17:17:42 +01:00
Armin
577157c505 Some fixes + refactoring + logic to receive sharedInboxEndpoints and to add new one 2019-02-26 17:11:41 +01:00
Wolfgang Huß
78b25ba05e Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-02-26 16:47:57 +01:00
Robert Schäfer
505d147516
Merge branch 'master' into dependabot/npm_and_yarn/@babel/core-7.3.4 2019-02-26 16:37:29 +01: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
dependabot[bot]
d0df4e8df0
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 15:16:38 +00: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
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
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
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
Matt Rider
40c210a0ce Start unit testing report feature 2019-02-21 21:13:30 -03:00
Grzegorz Leoniec
3bee47c748
Merge branch 'master' into 37-full-text-search-top-bar 2019-02-21 22:32:44 +01:00
Grzegorz Leoniec
a1e5e866d1
Merge branch 'master' into editor 2019-02-21 22:32:31 +01:00
dependabot[bot]
a473e8e059
Merge pull request #167 from Human-Connection/dependabot/npm_and_yarn/neo4j-graphql-js-2.4.0 2019-02-21 21:32:04 +00:00
dependabot[bot]
d8af7cb2e5
Bump neo4j-graphql-js from 2.3.1 to 2.4.0 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.3.1 to 2.4.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-02-21 21:25:16 +00:00
dependabot[bot]
f283948035
Merge pull request #168 from Human-Connection/dependabot/npm_and_yarn/jsonwebtoken-8.5.0 2019-02-21 21:22:48 +00:00