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

1846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
c91a61af89 Merging webapp to master 2019-03-20 21:06:17 +01:00
Robert Schäfer
7a72185c9e Merging backend to master 2019-03-20 21:00:59 +01:00
Robert Schäfer
71bee4ef7e Root commit for master branch 2019-03-20 21:00:59 +01:00
Robert Schäfer
7d26b03f88
Merge pull request #254 from Human-Connection/fix_performance_issues_during_tests 
Bundle all activityPub in middleware
 2019-03-20 19:38:59 +01:00
Robert Schäfer
431030f05b Follow review of @Mastercuber 2019-03-20 19:24:22 +01:00
Robert Schäfer
27e8b70412 Fix lint and refactor 
cc @Mastercuber
Send out an activity should be the responsibility of the middleware.
 2019-03-20 15:09:38 +01:00
Robert Schäfer
c2c9e98787 Fix http signature unit test 2019-03-20 14:01:32 +01:00
Robert Schäfer
a9963fb1a9 Bundle all activityPub in middleware 
This way we can disable it for the seeder server which does not need to
create RSA keys for all created users
 2019-03-19 21:29:41 +01:00
Robert Schäfer
09e23f13bb
Merge pull request #212 from Mastercuber/activitypub-editor 
[WIP] Activitypub Service integrated into Backend
 2019-03-19 19:52:53 +01:00
Robert Schäfer
4072bae1b1 Merge remote-tracking branch 'origin/master' into activitypub-editor 2019-03-19 16:18:53 +01:00
Robert Schäfer
8528399fc2 Merge remote-tracking branch 'origin/master' into activitypub-editor 2019-03-19 16:16:55 +01:00
Lala Sabathil
6cd17815d0
Merge pull request #253 from Human-Connection/dependabot/npm_and_yarn/jsonwebtoken-8.5.1 
Bump jsonwebtoken from 8.5.0 to 8.5.1
 2019-03-19 11:35:26 +01:00
Lala Sabathil
97f998b0c3
Merge pull request #266 from Human-Connection/dependabot/npm_and_yarn/jsonwebtoken-8.5.1 
Bump jsonwebtoken from 8.5.0 to 8.5.1
 2019-03-19 11:34:41 +01:00
dependabot[bot]
7a4f10395c
Bump jsonwebtoken from 8.5.0 to 8.5.1 
Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.5.0 to 8.5.1.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.0...v8.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-19 04:38:09 +00:00
dependabot[bot]
c4ba0a3bef
Bump jsonwebtoken from 8.5.0 to 8.5.1 
Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.5.0 to 8.5.1.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.0...v8.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-19 04:35:24 +00:00
Robert Schäfer
0c2a228b47
Merge pull request #264 from Human-Connection/37-full-text-search-top-bar 
37 full text search top bar
 2019-03-18 17:42:13 +01:00
Robert Schäfer
9987ad1c95 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-18 15:08:31 +01:00
mattwr18
2c2deacbb7
Merge pull request #208 from Human-Connection/27_disable_posts 
Disable posts
 2019-03-18 10:30:45 -03: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
41cf347f21 Fix ReportContent.feature 2019-03-16 19:41:56 +01:00
Robert Schäfer
4db242933f Fix HidePosts.feature 2019-03-16 19:24:39 +01:00
Robert Schäfer
a0257fc303 Oh, forgot post/_slug/index 
cc @appinteractive
 2019-03-16 12:41:28 +01:00
Robert Schäfer
c2e6416d44 Add post.createdAt in the bottom right corner 
@appinteractive feel free to change styling if this is too much visual
clutter.
 2019-03-16 12:35:46 +01:00
Robert Schäfer
580f142b2e Fetch missing disabled/deleted attributes 
Do you think it's better to **always request** the `disabled` and `deleted`
properties on the client or is it OK to **always return** these
properties even if the client did not ask for it?
@appinteractive @ulfgebhardt
 2019-03-16 12:08:51 +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
Robert Schäfer
67686d0af9 Refactoring for consistency 
The disabled/deleted part comes first (similar to guard clauses)
 2019-03-15 20:12:56 +01:00
Robert Schäfer
f33f3a4d16 Report/disable message shows data of the resource 2019-03-15 19:56:21 +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
Robert Schäfer
07731ca548 Nuxt-link makes showAuthorPopover unneccessary 2019-03-15 17:26:30 +01:00
Robert Schäfer
6beabf7eda Moderators see a red border around disabled users 2019-03-15 17:12:52 +01:00
Robert Schäfer
7bc3214d98 User component shows anonymus if disabled 2019-03-15 17:03:43 +01:00
Robert Schäfer
e6af5a11ab Tests pass 2019-03-15 16:56:24 +01:00
Robert Schäfer
3fad432858 Merge Author+RelatedUser into User component 2019-03-15 16:47:51 +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
fc244cd098 More honest translations 2019-03-14 23:21:19 +01:00
Robert Schäfer
e0dd39d5fc Fix bug: No red border of comment for user 2019-03-14 23:17:20 +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