IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-16 09:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,189 Commits 5 Branches 2 Tags
Commit Graph

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lala Sabathil
ecd05b3e15
Merge pull request #177 from Human-Connection/dependabot/submodules/Nitro-Backend-fd8cc3f 
Bump Nitro-Backend from `158ac36` to `fd8cc3f`
 2019-03-19 11:34:12 +01:00
Lala Sabathil
2a82975cd8
Merge pull request #178 from Human-Connection/dependabot/submodules/Nitro-Styleguide-3f7a00b 
Bump Nitro-Styleguide from `baf3134` to `3f7a00b`
 2019-03-19 11:34:03 +01:00
Lala Sabathil
62163ce39a
Merge pull request #180 from Human-Connection/dependabot/submodules/Nitro-Web-0c2a228 
Bump Nitro-Web from `0fae7a2` to `0c2a228`
 2019-03-19 11:33: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
dependabot[bot]
d91ae4e40d
Bump Nitro-Web from 0fae7a2 to 0c2a228 
Bumps [Nitro-Web](https://github.com/Human-Connection/Nitro-Web) from `0fae7a2` to `0c2a228`.
- [Release notes](https://github.com/Human-Connection/Nitro-Web/releases)
- [Commits](0fae7a26e5...0c2a228b47)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-19 04:22:49 +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
caa41f6519
Merge pull request #12 from Human-Connection/travis_ci 
Deploy all the things
 2019-03-18 15:17:48 +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
dependabot[bot]
f228eb3e3c
Bump metascraper from 4.8.5 to 4.10.3 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 4.8.5 to 4.10.3.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v4.8.5...v4.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 05:00:26 +00:00
dependabot[bot]
eebd2b9184
Bump Nitro-Styleguide from baf3134 to 3f7a00b 
Bumps [Nitro-Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) from `baf3134` to `3f7a00b`.
- [Release notes](https://github.com/Human-Connection/Nitro-Styleguide/releases)
- [Commits](baf3134f9d...3f7a00b8b9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 04:20:19 +00:00
dependabot[bot]
921e5ea1e0
Bump Nitro-Backend from 158ac36 to fd8cc3f 
Bumps [Nitro-Backend](https://github.com/Human-Connection/Nitro-Backend) from `158ac36` to `fd8cc3f`.
- [Release notes](https://github.com/Human-Connection/Nitro-Backend/releases)
- [Commits](158ac36907...fd8cc3f7e6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-18 04:20:18 +00: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
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