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

745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lala Sabathil
6f075e08c5
Merge branch 'master' into activitypub-editor 2019-03-12 12:00:09 +01:00
Lala Sabathil
bc133b4728
Merge pull request #112 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.0.0-alpha.27 
Bump date-fns from 2.0.0-alpha.26 to 2.0.0-alpha.27
 2019-03-12 11:58:44 +01:00
Armin
ff9840b844 Signature Test lint fix 2019-03-11 02:21:16 +01:00
Armin
fc9acf0ae3 Merge branch 'activitypub-editor' of https://github.com/mastercuber/Nitro-Backend into activitypub-editor 2019-03-11 00:59:10 +01:00
Armin
77b7ed58d3 Add HTTP Signature Test (Problems with crypto lib till now) 2019-03-11 00:58:19 +01:00
Armin
b2d4dbb190
Merge branch 'master' into activitypub-editor 2019-03-10 23:55:14 +01:00
dependabot[bot]
a1b9f770ce
Bump date-fns from 2.0.0-alpha.26 to 2.0.0-alpha.27 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-alpha.26 to 2.0.0-alpha.27.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-alpha.26...v2.0.0-alpha.27)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-10 19:41:58 +00:00
Robert Schäfer
28a37c226a
Merge pull request #213 from Human-Connection/get_rid_of_resource_type 
Get rid of resource type
 2019-03-10 20:39:09 +01:00
Grzegorz Leoniec
2116936062 Fixed shout and follow seeding 2019-03-10 19:05:50 +01:00
Robert Schäfer
60d711bb0a Prevent to report any type 
Resouce must have a label (Post|Comment|User)
 2019-03-10 19:05:50 +01:00
Robert Schäfer
ee5c4127e6 Prevent disabling any type 
Resource must have a label Post|Comment|User
 2019-03-10 19:05:50 +01:00
Robert Schäfer
f14c903d2a Refactor: we don't need a setup object 2019-03-10 19:05:50 +01:00
Robert Schäfer
cae3330105 Fix deprecation: async function passed to describe 2019-03-10 19:05:50 +01:00
Grzegorz Leoniec
e82cf9b349
Merge branch 'master' into get_rid_of_resource_type 2019-03-10 17:22:22 +01:00
Grzegorz Leoniec
96c48310dd
Merge branch 'activitypub-editor' of github.com:Mastercuber/Nitro-Backend into activitypub-editor 2019-03-08 21:08:22 +01:00
Grzegorz Leoniec
af4cfad3a2
Added PRIVATE_KEY_PASSPHRASE to docker compose 2019-03-08 21:08:18 +01:00
Grzegorz Leoniec
d656504e30
Merge branch 'master' into activitypub-editor 2019-03-08 21:04:36 +01:00
Grzegorz Leoniec
6f53d5e425
Fixing ghots issues 2019-03-08 21:02:24 +01:00
Robert Schäfer
261edef72b Remove duplicate mutations 2019-03-08 20:55:46 +01:00
Grzegorz Leoniec
45cf16d07d
Updates to get in line with master 2019-03-08 20:51:43 +01:00
Grzegorz Leoniec
5c91962808
Merged master in and updated what had to be updated 2019-03-08 20:50:58 +01:00
dependabot[bot]
e60d098317
Merge pull request #209 from Human-Connection/dependabot/npm_and_yarn/neo4j-graphql-js-2.4.2 2019-03-08 19:25:22 +00:00
dependabot[bot]
eb5c561675
Bump neo4j-graphql-js from 2.3.1 to 2.4.2 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.3.1 to 2.4.2.
- [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-03-08 17:44:58 +00:00
dependabot[bot]
b01fb97629
Merge pull request #214 from Human-Connection/dependabot/npm_and_yarn/neo4j-driver-1.7.3 2019-03-08 17:29:40 +00:00
dependabot[bot]
f792ad3c02
Bump neo4j-driver from 1.7.2 to 1.7.3 
Bumps [neo4j-driver](https://github.com/neo4j/neo4j-javascript-driver) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/neo4j/neo4j-javascript-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-javascript-driver/compare/1.7.2...1.7.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 17:17:57 +00:00
Grzegorz Leoniec
9260705611
Fixed shout seeding 2019-03-08 17:03:59 +01:00
Grzegorz Leoniec
f86fc7507c
Fixed shout and follow seeding 2019-03-08 16:49:43 +01:00
Lala Sabathil
8c4c7709b5
Merge branch 'master' into get_rid_of_resource_type 2019-03-08 15:44:51 +01:00
Grzegorz Leoniec
e6d0948896
Merge pull request #201 from Human-Connection/distinct-shouts-and-follows 
Fix follow and shout status
 2019-03-08 15:33:37 +01:00
Lala Sabathil
803bd237bd
Merge branch 'master' into get_rid_of_resource_type 2019-03-08 12:36:09 +01:00
Lala Sabathil
699c612709
Merge branch 'master' into distinct-shouts-and-follows 2019-03-08 12:35:22 +01:00
Lala Sabathil
f54227ffbf
Merge pull request #215 from Human-Connection/dependabot/npm_and_yarn/jest-24.3.1 
Bump jest from 24.1.0 to 24.3.1
 2019-03-08 12:31:41 +01:00
Grzegorz Leoniec
c854e8e98c
Merge remote-tracking branch 'origin/master' into distinct-shouts-and-follows 2019-03-08 12:07:35 +01:00
dependabot[bot]
c8ba2f6558
Bump jest from 24.1.0 to 24.3.1 
Bumps [jest](https://github.com/facebook/jest) from 24.1.0 to 24.3.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.1.0...v24.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 10:59:31 +00:00
Grzegorz Leoniec
dfc28acfe5
Do nodemon restart on .js and .graphql files 2019-03-08 11:56:15 +01:00
Lala Sabathil
d930c2d245
Merge branch 'master' into distinct-shouts-and-follows 2019-03-08 11:50:05 +01:00
Lala Sabathil
76197657bf
Merge branch 'master' into get_rid_of_resource_type 2019-03-08 11:49:38 +01:00
Lala Sabathil
477972f2ba
Merge pull request #216 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.3.1 
Bump babel-jest from 24.1.0 to 24.3.1
 2019-03-08 11:44:23 +01:00
dependabot[bot]
13d7f677e8
Bump babel-jest from 24.1.0 to 24.3.1 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.1.0 to 24.3.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.3.1/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-08 04:23:50 +00:00
Lala Sabathil
c50c4b78d9
Merge branch 'master' into distinct-shouts-and-follows 2019-03-08 01:00:19 +01:00
Robert Schäfer
f68e289016 Fix lint 2019-03-07 22:44:43 +01:00
Robert Schäfer
0529e2b2b0 Refactor report mutation, return a proper Report 2019-03-07 22:42:32 +01:00
Matt Rider
61a45d39ea Respond with reporter, resource 2019-03-07 17:43:00 -03:00
Matt Rider
d00e4fad39 Merge branch 'master' of github.com:Human-Connection/Nitro-Backend into get_rid_of_resource_type 2019-03-07 16:16:25 -03:00
Robert Schäfer
95e9c14cc6 Refactor report mutation/type to reduce redundancy 
We don't need to save the type of the reported resource. We can derive
it.
 2019-03-07 20:13:39 +01:00
Robert Schäfer
4596041186 Refactor mutations without Resource type 2019-03-07 20:13:25 +01:00
Robert Schäfer
2d24fc9945
Merge pull request #207 from Human-Connection/27_disable_posts 
Disable posts
 2019-03-07 19:14:33 +01:00
Robert Schäfer
1377455cda Disable/enable should return the Resource 2019-03-07 18:31:54 +01:00
Lala Sabathil
ccb7241bf7
Merge branch 'master' into 27_disable_posts 2019-03-07 16:46:34 +01:00
Lala Sabathil
d3ed4ad75f
Merge branch 'master' into distinct-shouts-and-follows 2019-03-07 16:45:52 +01:00