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

13067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lala Sabathil
78617335c7
Merge pull request #176 from Human-Connection/dependabot/submodules/Nitro-Backend-158ac36 
Bump Nitro-Backend from `fd02679` to `158ac36`
 2019-03-16 02:39:24 +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
dependabot[bot]
141b05819b
Bump Nitro-Backend from fd02679 to 158ac36 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `fd02679` to `158ac36`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](fd02679588...158ac36907)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-15 05:00:17 +00: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
f9b33f5cc2
Merge pull request #175 from Human-Connection/dependabot/submodules/Nitro-Backend-fd02679 
Bump Nitro-Backend from `0dce83b` to `fd02679`
 2019-03-14 12:46:59 +01:00
Lala Sabathil
7547407c42
Merge pull request #174 from Human-Connection/dependabot/submodules/Nitro-Web-0fae7a2 
Bump Nitro-Web from `a05b438` to `0fae7a2`
 2019-03-14 12:46:46 +01: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]
a46d2c59d0
Bump Nitro-Backend from 0dce83b to fd02679 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `0dce83b` to `fd02679`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](0dce83b55f...fd02679588)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 04:38:02 +00:00
dependabot[bot]
031b8da673
Bump Nitro-Web from a05b438 to 0fae7a2 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `a05b438` to `0fae7a2`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](a05b438b3c...0fae7a26e5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-14 04:38:01 +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
mattwr18
53bd169945
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-13 22:52:49 -03:00
Robert Schäfer
7160006eed Show red border for moderators 2019-03-14 02:11:17 +01:00
Robert Schäfer
c2d7002795 Translations 2019-03-14 02:11:17 +01:00
Robert Schäfer
48a85b4af3 Copy+paste from post/_slug page 2019-03-14 02:11:17 +01:00
Robert Schäfer
08d0679a67 Show the comment content if you are a moderator 2019-03-14 02:11:17 +01:00
Robert Schäfer
bb2a6c052e Comment component shows content unless disabled 2019-03-14 02:11:17 +01:00
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