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

793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
af4f201a13
Merge branch 'master' into showDisabledForModerators 2019-03-14 00:15:40 +01:00
Robert Schäfer
a6e52bc10b
Merge pull request #225 from Human-Connection/dependabot/npm_and_yarn/supertest-4.0.0 
Bump supertest from 3.4.2 to 4.0.0
 2019-03-14 00:08:12 +01:00
Robert Schäfer
a252879964 Implement obfuscation behaviour 2019-03-13 21:09:15 +01:00
Robert Schäfer
d71cb16a01 Spec a new behaviour of softDisable 
If we have nested content, the content should be obfuscated instead of
being filtered.

cc @datenbrei
 2019-03-13 21:09:15 +01:00
Robert Schäfer
7d82b27aaa Hide disabled comments and posts by default 
I had to trick neo4j-graphql-js to return disabled and deleted fields by
default on any neo4j node. If disabled is not queried, then we don't
have it in our middleware and we're not able to filter it.
 2019-03-13 21:09:15 +01:00
dependabot[bot]
f36c91a2a1
Bump supertest from 3.4.2 to 4.0.0 
Bumps [supertest](https://github.com/visionmedia/supertest) from 3.4.2 to 4.0.0.
- [Release notes](https://github.com/visionmedia/supertest/releases)
- [Commits](https://github.com/visionmedia/supertest/compare/v3.4.2...v4.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 18:26:11 +00:00
Robert Schäfer
045b5b1660
Merge pull request #232 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-jest-22.3.2 
Bump eslint-plugin-jest from 22.3.0 to 22.3.2
 2019-03-13 19:23:45 +01:00
Robert Schäfer
0a3dacc556
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-22.3.2 2019-03-13 19:23:37 +01:00
Robert Schäfer
ffe28af856
Merge pull request #231 from Human-Connection/dependabot/npm_and_yarn/babel-jest-24.5.0 
Bump babel-jest from 24.3.1 to 24.5.0
 2019-03-13 19:23:09 +01:00
dependabot[bot]
412f220dba
Bump eslint-plugin-jest from 22.3.0 to 22.3.2 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.3.0 to 22.3.2.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.3.0...v22.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 16:28:31 +00:00
dependabot[bot]
e6d51d04bc
Bump babel-jest from 24.3.1 to 24.5.0 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.3.1 to 24.5.0.
- [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.5.0/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 16:27:59 +00:00
Robert Schäfer
af03b4958b
Merge pull request #223 from Human-Connection/212-change-password 
Change password in the backend
 2019-03-13 17:25:38 +01:00
Robert Schäfer
57fc99fc3f Fix merge error again 
cc @Lulaby pay attention when merging `master`
 2019-03-13 17:01:49 +01:00
Lala Sabathil
12fc42973a
Merge branch 'master' into 212-change-password 2019-03-13 16:50:19 +01:00
Robert Schäfer
e9e0c84cb2 Fixed merge error 
CC @Lulalaby
 2019-03-13 16:48:56 +01:00
Lala Sabathil
5308c3bff2
Merge pull request #235 from Human-Connection/234-test-follow-and-shout-unauthenticated 
Add unauthenticated test to follow and shout
 2019-03-13 16:20:51 +01:00
Wolfgang Huß
460f94ea3f Add unauthenticated test to follow and shout 
close #234
 2019-03-13 14:32:15 +01:00
Wolfgang Huß
a6f96cad78 Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-03-12 18:45:49 +01:00
Grzegorz Leoniec
0dce83b55f
Merge pull request #152 from Human-Connection/37-full-text-search-top-bar 
[WIP] 37 full text search top bar
 2019-03-12 16:07:55 +01:00
Wolfgang Huß
29afce7c27 Merge branch 'master' of https://github.com/Human-Connection/Nitro-Backend 2019-03-12 16:04:31 +01:00
Lala Sabathil
9ef4948a7f
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-12 12:02:26 +01:00
Lala Sabathil
9a4c911eb0
Merge branch 'master' into 212-change-password 2019-03-12 12:01:00 +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
Wolfgang Huß
22b521b93d Deleted a line in graphql.schema 2019-03-11 17:02:31 +01:00
Lala Sabathil
628502de05
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-11 14:37:02 +01:00
Lala Sabathil
2b6f7270b5
Merge branch 'master' into 212-change-password 2019-03-11 02:19:02 +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
kachulio1
0a31e5278c add test for correct credentials 2019-03-10 01:44:41 +03:00
kachulio1
6cba9f1fd8 remove image url 2019-03-10 00:50:16 +03:00
kachulio1
3fbe4cb2e6 add use single quotes 2019-03-10 00:48:16 +03:00
kachulio1
bd2a7e5332 fix merge conflicts 2019-03-09 14:52:59 +03:00
kachulio1
35339b4674 add changePassword mutation test 2019-03-09 14:50:23 +03:00
kachulio1
82ae81d8fe add changePasssword mutation 2019-03-09 14:50:23 +03:00
kachulio1
8fcefc63bc add changePassword mutation test 2019-03-09 14:47:12 +03:00
kachulio1
4350590697 add changePasssword mutation 2019-03-09 13:36:27 +03:00
Robert Schäfer
261edef72b Remove duplicate mutations 2019-03-08 20:55:46 +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
Grzegorz Leoniec
11a539d63e
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-08 18:39:40 +01: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