ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,559 Commits 117 Branches 1,511 Tags
Commit Graph

9559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dries Cruyskens
abdc80727d Hero image height on post page is now set withouth having to wait for the image to load. Vue gives the image aspect ratio to css as a css variable, css then sets the correct height in fuction of the width. 2020-05-28 15:15:14 +02:00
Wolfgang Huß
c517c0fd45 Fix lint 2020-05-28 12:04:26 +02:00
Wolfgang Huß
dcc5b74038 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-05-28 10:52:24 +02:00
Wolfgang Huß
5e1a538094 Fix locales 2020-05-28 10:52:11 +02:00
Wolfgang Huß
c9dc7d9b5e
Merge pull request #3525 from Human-Connection/updgrade-to-v0.6.1 
chore: Upgrade to v0.6.1
 2020-05-04 13:31:25 +02:00
Wolfgang Huß
a99ee763e6 Upgrade to v0.6.1 2020-05-04 12:40:34 +02:00
ogerly
7b48339e18 fix: admin can delete himself 2020-04-30 15:59:22 +02:00
ogerly
fcc46d7f61 fix: DeleteData.spec.js 2020-04-30 12:56:03 +02:00
ogerly
3de96a2eaa fix: lint 2020-04-30 12:36:12 +02:00
ogerly
c471f9797f fix: is not sorted by keys 2020-04-30 12:32:53 +02:00
ogerly
b2326c710e git pull conflicts fixed 2020-04-29 10:10:14 +02:00
ogerly
7e5a7f5d42 bug: deleteUser on old status, currentUserCounts are retrieved additionally, admin cannot delete himself via his user settings 2020-04-29 10:04:54 +02:00
ogerly
4210727ddf bug: fix - contributionCount, commentCount remove from code 2020-04-27 13:55:29 +02:00
ogerly
8a2d238f96 fix: #3498 Checkboxes missing on delete user account page 2020-04-26 13:11:32 +02:00
Wolfgang Huß
9aacb22a58
Merge pull request #3293 from Human-Connection/1741-follow-lists 
feat: FollowerList [1741]
 2020-04-20 13:01:29 +02:00
Raphael Beer
e70faa0a2d
Review: user-teasers as unordered list 2020-04-19 17:58:22 +02:00
Raphael Beer
97a30ad8f8
Review: more cut off user-teaser vsisible 2020-04-16 20:15:10 +02:00
Raphael Beer
32e5801d20
Merge pull request #3356 from Human-Connection/2727-fix-disappearing-embed-text 
fix: Text of editor embeds disappearing on click [2727]

Quick fix to at least stop the text from disappearing. Embeds need a general overhaul, which is being tracked in #3395
 2020-04-16 12:48:56 +02:00
Raphael Beer
ee33731178
Review: test improvements 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2020-04-15 23:32:54 +02:00
Robert Schäfer
a9111973c8
Merge pull request #3475 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.5.2 
build(deps-dev): bump css-loader from 3.5.1 to 3.5.2 in /webapp
 2020-04-13 16:52:32 +02:00
mattwr18
08f2f1e4b4
Merge pull request #3472 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-context-1.0.20 
build(deps): bump apollo-link-context from 1.0.19 to 1.0.20 in /backend
 2020-04-13 09:13:58 +02:00
dependabot-preview[bot]
fb95c7902d
build(deps-dev): bump css-loader from 3.5.1 to 3.5.2 in /webapp 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.1...v3.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-13 04:18:50 +00:00
dependabot-preview[bot]
9af0fe01ce
build(deps): bump apollo-link-context from 1.0.19 to 1.0.20 in /backend 
Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.19 to 1.0.20.
- [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-context@1.0.19...apollo-link-context@1.0.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-13 04:14:52 +00:00
Robert Schäfer
cd0fdb8c09
Merge pull request #3467 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.12.0 
build(deps): bump date-fns from 2.11.1 to 2.12.0 in /webapp
 2020-04-11 17:09:15 +02:00
Robert Schäfer
dbf558faf7
Merge pull request #3459 from Human-Connection/dependabot/npm_and_yarn/webapp/jest-25.3.0 
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /webapp
 2020-04-11 17:09:09 +02:00
Robert Schäfer
1f88dc2f57
Merge pull request #3464 from Human-Connection/dependabot/npm_and_yarn/date-fns-2.12.0 
build(deps-dev): bump date-fns from 2.11.1 to 2.12.0
 2020-04-11 17:09:04 +02:00
Robert Schäfer
b047a3d74f
Merge pull request #3465 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-link-http-1.5.17 
build(deps): bump apollo-link-http from 1.5.16 to 1.5.17 in /backend
 2020-04-11 17:08:56 +02:00
dependabot-preview[bot]
b9aaafa01c
build(deps): bump date-fns from 2.11.1 to 2.12.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.11.1...v2.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:25:39 +00:00
dependabot-preview[bot]
10e2ed1800
build(deps): bump apollo-link-http from 1.5.16 to 1.5.17 in /backend 
Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.16 to 1.5.17.
- [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.16...apollo-link-http@1.5.17)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:18:51 +00:00
dependabot-preview[bot]
15271a9f89
build(deps-dev): bump date-fns from 2.11.1 to 2.12.0 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.11.1...v2.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-10 04:15:37 +00:00
Raphael Beer
30f66c3e14
Review: storybook 2020-04-10 00:21:31 +02:00
Raphael Beer
e018e2ead9
Review: add hasMore() computed value + 
Replacing varying conditions for same
  logic with computed value `hasMore`.
 2020-04-09 23:52:18 +02:00
Raphael Beer
b3f1137006
Review: fix styles 2020-04-09 23:39:47 +02:00
Raphael Beer
2c7ca87acc
Review: lint 2020-04-09 23:16:37 +02:00
Raphael Beer
7ff9d617d6
Review: remove showing both types in stories 2020-04-09 23:16:37 +02:00
Raphael Beer
38233da6d0
review: apply suggestions 
Co-Authored-By: Alina Beck <alina.beck@mail.com>
 2020-04-09 23:01:54 +02:00
dependabot-preview[bot]
101dfd7278
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 25.2.7 to 25.3.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/v25.2.7...v25.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 10:55:44 +00:00
Robert Schäfer
501178c9ea
Merge pull request #3456 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-25.3.0 
build(deps-dev): bump babel-jest from 25.2.6 to 25.3.0 in /webapp
 2020-04-09 12:52:47 +02:00
dependabot-preview[bot]
b131e41133
build(deps-dev): bump babel-jest from 25.2.6 to 25.3.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.6 to 25.3.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/v25.3.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 06:57:24 +00:00
mattwr18
1c27e0b1f9
Merge pull request #3454 from Human-Connection/dependabot/npm_and_yarn/backend/prettier-2.0.4 
build(deps-dev): bump prettier from 2.0.2 to 2.0.4 in /backend
 2020-04-09 08:54:44 +02:00
mattwr18
05018a89ff
Merge pull request #3453 from Human-Connection/dependabot/npm_and_yarn/backend/jest-25.3.0 
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /backend
 2020-04-09 08:54:28 +02:00
mattwr18
5125a2b34b
Merge pull request #3452 from Human-Connection/dependabot/npm_and_yarn/expect-25.3.0 
build(deps-dev): bump expect from 25.2.7 to 25.3.0
 2020-04-09 08:53:46 +02:00
dependabot-preview[bot]
e042a44cf5
build(deps-dev): bump prettier from 2.0.2 to 2.0.4 in /backend 
Bumps [prettier](https://github.com/prettier/prettier) from 2.0.2 to 2.0.4.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.2...2.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 04:17:23 +00:00
dependabot-preview[bot]
336599589b
build(deps-dev): bump jest from 25.2.7 to 25.3.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 25.2.7 to 25.3.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/v25.2.7...v25.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 04:16:32 +00:00
dependabot-preview[bot]
db78076292
build(deps-dev): bump expect from 25.2.7 to 25.3.0 
Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 25.2.7 to 25.3.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/v25.3.0/packages/expect)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-09 04:15:29 +00:00
mattwr18
941dd97592
Merge pull request #3446 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.3.1 
build(deps-dev): bump @vue/cli-shared-utils from 4.3.0 to 4.3.1 in /webapp
 2020-04-08 15:11:58 +02:00
mattwr18
d044a58572
Merge pull request #3448 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.5.1 
build(deps-dev): bump css-loader from 3.5.0 to 3.5.1 in /webapp
 2020-04-08 15:11:39 +02:00
mattwr18
bc16d70319
Merge pull request #3443 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.12.0 
build(deps): bump apollo-server-express from 2.11.0 to 2.12.0 in /backend
 2020-04-08 08:42:19 +02:00
mattwr18
ff2aa7229e
Merge pull request #3441 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.9.5 
build(deps-dev): bump @babel/preset-env from 7.9.0 to 7.9.5 in /backend
 2020-04-08 08:41:56 +02:00
mattwr18
1dc79b11ad
Merge pull request #3439 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.11.8 
build(deps): bump metascraper-image from 5.11.6 to 5.11.8 in /backend
 2020-04-08 08:41:39 +02:00