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

851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
8528399fc2 Merge remote-tracking branch 'origin/master' into activitypub-editor 2019-03-19 16:16:55 +01:00
Robert Schäfer
fd8cc3f7e6
Merge pull request #246 from Human-Connection/27_disable_posts 
Obfuscate user name and use a neutral replacement
 2019-03-17 14:46:48 +01:00
Robert Schäfer
a20a8d09a2
Merge branch 'master' into 27_disable_posts 2019-03-17 14:24:04 +01:00
Robert Schäfer
dbe28d2118
Merge pull request #242 from Human-Connection/disable_user 
[WIP] Disabled users are unauthenticated
 2019-03-16 22:26:05 +01:00
Robert Schäfer
71ed58de3a Create a nice discussion on the most recent post 2019-03-15 20:47:33 +01:00
Robert Schäfer
d0fd20e790 Obfuscate user name and use a neutral replacement 2019-03-15 20:36:18 +01:00
abdellani
1f93dbbdfc Resolve some errors related to 'no-trailing-spaces' 2019-03-15 18:50:42 +01:00
abdellani
eacb0a452e Show error message when a disabled user tries to authenticate 2019-03-15 18:44:48 +01:00
abdellani
b7cc18ee98 Show error message when a disabled user tries to authenticate 2019-03-15 18:33:07 +01:00
abdellani
b4372dff36 Show error message when a disabled user tries to authenticate 2019-03-15 14:59:36 +01:00
Robert Schäfer
b0ce023f49 Create failing test 
@abdellani your turn 💪
 2019-03-14 16:44:22 +01:00
Robert Schäfer
b04e922afc Disabled users are unauthenticated 2019-03-14 16:24:16 +01:00
Lala Sabathil
158ac36907
Merge pull request #241 from Human-Connection/dependabot/npm_and_yarn/dotenv-7.0.0 
Bump dotenv from 6.2.0 to 7.0.0
 2019-03-14 13:07:08 +01:00
dependabot[bot]
582d2e5c4e
Bump dotenv from 6.2.0 to 7.0.0 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 6.2.0 to 7.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v6.2.0...v7.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 11:57:44 +00:00
dependabot[bot]
977ecf723b
Merge pull request #240 from Human-Connection/dependabot/npm_and_yarn/jest-24.5.0 2019-03-14 11:55:12 +00:00
Lala Sabathil
e158bc9f37
Merge branch 'master' into dependabot/npm_and_yarn/jest-24.5.0 2019-03-14 12:43:40 +01:00
dependabot[bot]
ef2c23a63f
Merge pull request #239 from Human-Connection/dependabot/npm_and_yarn/apollo-link-http-1.5.13 2019-03-14 11:43:26 +00:00
dependabot[bot]
6b5afe0520
Bump jest from 24.4.0 to 24.5.0 
Bumps [jest](https://github.com/facebook/jest) from 24.4.0 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/compare/v24.4.0...v24.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 04:17:11 +00:00
dependabot[bot]
41ee83a9a8
Bump apollo-link-http from 1.5.12 to 1.5.13 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.12 to 1.5.13.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.12...apollo-link-http@1.5.13)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 04:16:57 +00:00
Lala Sabathil
fd02679588
Merge pull request #230 from Human-Connection/showDisabledForModerators 
Obfuscate disabled comments and posts by default
 2019-03-14 00:30:50 +01:00
Lala Sabathil
4c85465ef8
Merge branch 'master' into showDisabledForModerators 2019-03-14 00:18:09 +01:00
Lala Sabathil
d1a9f2f0f1
Merge pull request #227 from Human-Connection/dependabot/npm_and_yarn/jest-24.4.0 
Bump jest from 24.3.1 to 24.4.0
 2019-03-14 00:17:47 +01:00
dependabot[bot]
dc9706caf3 Bump jest from 24.3.1 to 24.4.0 
Bumps [jest](https://github.com/facebook/jest) from 24.3.1 to 24.4.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/compare/v24.3.1...v24.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 00:16:27 +01:00
Robert Schäfer
af4f201a13
Merge branch 'master' into showDisabledForModerators 2019-03-14 00:15:40 +01:00
Lala Sabathil
f4eca06d5e
Merge branch 'master' into activitypub-editor 2019-03-14 00:09:19 +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
Robert Schäfer
4e91bddf9a
Merge branch 'master' into activitypub-editor 2019-03-13 19:26:51 +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
Armin
9dffb69162 Fix blank lines in test 2019-03-13 14:39:00 +01:00
Wolfgang Huß
460f94ea3f Add unauthenticated test to follow and shout 
close #234
 2019-03-13 14:32:15 +01:00
Robert Schäfer
ac155b7f17 Small refactoring let client in the upmost scope 
cc @Tirokk
 2019-03-13 13:57:46 +01:00
Robert Schäfer
3d56875be5 Typo 2019-03-13 13:51:51 +01:00
Armin
a5e769de3f Merge branch 'activitypub-editor' of https://github.com/mastercuber/Nitro-Backend into activitypub-editor 2019-03-13 02:03:35 +01:00
Armin
5ea3ef99e1 Fixed follow feature + clean database after tests run + wait for user to be created before proceed 2019-03-13 01:17:17 +01:00
Lala Sabathil
50639ec61f
Merge branch 'master' into activitypub-editor 2019-03-12 23:47:11 +01:00
Armin
00ba891cbf Some refactoring + add timeout functions to some step definitions + add objectId to Post and schema 2019-03-12 22:50:58 +01:00
Armin
5aeb2845db Change test port in some feature files 2019-03-12 19:14:13 +01:00