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

3916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
4845904ddf Sketch comment component 2019-03-14 02:11:17 +01:00
Lala Sabathil
c934cc339e
Merge branch 'master' into 27_disable_posts 2019-03-14 00:47:00 +01:00
Lala Sabathil
0fae7a26e5
Merge pull request #254 from Human-Connection/dependabot/npm_and_yarn/jest-24.5.0 
Bump jest from 24.1.0 to 24.5.0
 2019-03-14 00:42:16 +01:00
dependabot[bot]
192e3290b1
Bump jest from 24.1.0 to 24.5.0 
Bumps [jest](https://github.com/facebook/jest) from 24.1.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.1.0...v24.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 23:38:03 +00:00
Lala Sabathil
5e8497e510
Merge pull request #255 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-14 00:35:55 +01: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
dependabot[bot]
d62a9c0480
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 22:55:25 +00:00
Lala Sabathil
ae5f663c4d
Merge pull request #258 from Human-Connection/remove_cypress_dependency 
Remove cypress from package.json
 2019-03-13 23:46:34 +01:00
Robert Schäfer
c3dd027c9f Remove cypress from package.json 
cc @mattwr18 added by accident?
 2019-03-13 23:30:24 +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
Matt Rider
c8f66d168a Merge branch '37-full-text-search-top-bar' of github.com:Tirokk/Nitro-Web into 37-full-text-search-top-bar 2019-03-13 11:30:47 -03:00
Matt Rider
22eec97551 Fix onSelect test to use realistic results 2019-03-13 11:29:41 -03: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
Lala Sabathil
2d2fb9c9a9
Merge pull request #173 from Human-Connection/dependabot/submodules/Nitro-Styleguide-baf3134 
Bump Nitro-Styleguide from `e77754c` to `baf3134`
 2019-03-13 14:05:00 +01:00
Lala Sabathil
f7d52e1ea4
Merge pull request #172 from Human-Connection/dependabot/submodules/Nitro-Web-a05b438 
Bump Nitro-Web from `4aa640a` to `a05b438`
 2019-03-13 14:04:54 +01:00
Lala Sabathil
15e5c39b6a
Merge pull request #171 from Human-Connection/dependabot/submodules/Nitro-Backend-0dce83b 
Bump Nitro-Backend from `28a37c2` to `0dce83b`
 2019-03-13 14:04:46 +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
Grzegorz Leoniec
6e8e51d99a
Remove styleguide installation instructions 
Styleguide is now a npm dependency.
 2019-03-13 13:12:38 +01:00
Grzegorz Leoniec
a09df8fe24
Merge pull request #27 from proofy/patch-1 
Update local-backend.md
 2019-03-13 13:07:52 +01:00
Grzegorz Leoniec
caa9a98c19
Use the LTS version of Node 2019-03-13 13:06:43 +01:00
Grzegorz Leoniec
9cad81fa25
Make disabled content more "pretty" 2019-03-13 12:51:50 +01:00
dependabot[bot]
453508040a
Bump Nitro-Styleguide from e77754c to baf3134 
Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `e77754c` to `baf3134`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](e77754cb78...baf3134f9d)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 04:47:53 +00:00
dependabot[bot]
e0578fa4fe
Bump Nitro-Web from 4aa640a to a05b438 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `4aa640a` to `a05b438`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](4aa640a2e5...a05b438b3c)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 04:47:52 +00:00
dependabot[bot]
5cf9145dd9
Bump Nitro-Backend from 28a37c2 to 0dce83b 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `28a37c2` to `0dce83b`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](28a37c226a...0dce83b55f)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-13 04:47:52 +00: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
Robert Schäfer
0ba0d2f0a2 Implement effects but remove modals from DOM 2019-03-12 23:26:56 +01:00