13146 Commits

Author SHA1 Message Date
58928d4b56
Merge branch 'master' into unused-packages-backend 2023-05-24 14:56:21 +02:00
Markus
e0183a949f
Merge pull request #6154 from Ocelot-Social-Community/newsfeed-layout-fixes
fix(webapp): fix newsfeed layout
b2.6.0-416
2023-05-24 10:46:03 +02:00
Markus
87b41769f1 Merge branch 'master' into newsfeed-layout-fixes 2023-05-24 10:17:00 +02:00
Markus
e54629554b Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-05-24 10:16:44 +02:00
Markus
12a4ab6b83 merged master and resolved conflict in webapp/pages/index.vue 2023-05-24 10:16:07 +02:00
Markus
7b6fed6d64
Merge pull request #6308 from Ocelot-Social-Community/6142-comment-mention-missing-white-space
fix(webapp): adds white space after user handle in comment editor
b2.6.0-415
2023-05-24 09:57:48 +02:00
Markus
acf68796e6 Merge branch 'master' into 6142-comment-mention-missing-white-space 2023-05-24 09:32:55 +02:00
Markus
7bf2a8b25e Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-05-24 09:32:21 +02:00
58c28c37a4
Merge pull request #6076 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/validator-13.9.0
Bump validator from 13.0.0 to 13.9.0 in /backend
b2.6.0-414
2023-05-23 23:10:37 +02:00
dependabot[bot]
49d959d7a5
Bump validator from 13.0.0 to 13.9.0 in /backend
Bumps [validator](https://github.com/validatorjs/validator.js) from 13.0.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/validatorjs/validator.js/compare/13.0.0...13.9.0)

---
updated-dependencies:
- dependency-name: validator
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-23 18:53:30 +00:00
60ef71a467
Merge pull request #6312 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.34.4
Bump metascraper-soundcloud from 5.34.2 to 5.34.4 in /backend
b2.6.0-413
2023-05-23 20:28:56 +02:00
dependabot[bot]
69a01e2bf9
Bump metascraper-soundcloud from 5.34.2 to 5.34.4 in /backend
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-soundcloud) from 5.34.2 to 5.34.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-soundcloud/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.34.4/packages/metascraper-soundcloud)

---
updated-dependencies:
- dependency-name: metascraper-soundcloud
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-23 17:55:17 +00:00
67de6405b9
Merge pull request #6287 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/metascraper-audio-5.34.4
Bump metascraper-audio from 5.33.5 to 5.34.4 in /backend
b2.6.0-412
2023-05-23 19:29:53 +02:00
dependabot[bot]
09bfc32d97
Bump metascraper-audio from 5.33.5 to 5.34.4 in /backend
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-audio) from 5.33.5 to 5.34.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-audio/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.34.4/packages/metascraper-audio)

---
updated-dependencies:
- dependency-name: metascraper-audio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-23 15:34:38 +00:00
53200fbef3
Merge pull request #6310 from Ocelot-Social-Community/dependabot/docker/backend/node-20.2.0-alpine3.17
Bump node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17 in /backend
b2.6.0-411
2023-05-23 17:28:48 +02:00
2f362972fe
remove comment of unused(&deprecated) package 2023-05-23 17:25:31 +02:00
ee954c3a30
remove unused packages backend 2023-05-23 17:25:10 +02:00
dependabot[bot]
8f9ebd77b2
Bump node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17 in /backend
Bumps node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-23 14:24:08 +00:00
Wolfgang Huß
db6e45dafe
Merge pull request #6324 from Ocelot-Social-Community/6323-add-missing-todo-in-deployment-readme
docs(other): add missing todo in deployment readme 'TODO-next-update.md'
b2.6.0-410
2023-05-23 14:16:26 +02:00
Wolfgang Huß
6edca68fc9 Add missing todo in deployment readme 'TODO-next-update.md' 2023-05-23 13:19:06 +02:00
61ba556e4a
Merge pull request #6309 from Ocelot-Social-Community/dependabot/docker/webapp/node-20.2.0-alpine3.17
Bump node from 20.1.0-alpine3.17 to 20.2.0-alpine3.17 in /webapp
b2.6.0-409
2023-05-23 11:19:12 +02:00
dependabot[bot]
c754b766f8
Bump node from 20.1.0-alpine3.17 to 20.2.0-alpine3.17 in /webapp
Bumps node from 20.1.0-alpine3.17 to 20.2.0-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-23 08:49:33 +00:00
3e4ac2ef5e
Merge pull request #6318 from Ocelot-Social-Community/fix-helmet
fix(backend): helmet fix
b2.6.0-408
2023-05-22 13:21:07 +02:00
19f2b0ae66
default to empty object in helmet 2023-05-22 12:23:47 +02:00
Markus
dfd84f921c [fix] adds white space after mention in comment editor 2023-05-19 15:15:41 +02:00
Markus
cf4c9432f7 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-05-19 14:15:39 +02:00
fef12f51c0
Merge pull request #6303 from Ocelot-Social-Community/fix-graphiql-helmet
fix(backend): helmet + graphiql
b2.6.0-407
2023-05-16 12:08:35 +02:00
f68b3ccbda
Merge branch 'master' into fix-graphiql-helmet 2023-05-16 10:46:04 +02:00
e21b2b64ac
Merge pull request #6273 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/preset-env-7.21.5
Bump @babel/preset-env from 7.21.4 to 7.21.5
b2.6.0-406
2023-05-16 02:28:24 +02:00
8d51d906b2
Merge branch 'master' into fix-graphiql-helmet 2023-05-16 00:47:20 +02:00
dependabot[bot]
040890a119
Bump @babel/preset-env from 7.21.4 to 7.21.5
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.21.4 to 7.21.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.5/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-15 22:40:11 +00:00
3774dc52cb
Merge pull request #6283 from Ocelot-Social-Community/dependabot/npm_and_yarn/date-fns-2.30.0
Bump date-fns from 2.25.0 to 2.30.0
b2.6.0-405
2023-05-16 00:38:32 +02:00
dependabot[bot]
972bd41c26
Bump date-fns from 2.25.0 to 2.30.0
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.25.0 to 2.30.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/v2.30.0/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.25.0...v2.30.0)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-15 21:22:56 +00:00
4bd6d18acb
Merge pull request #6280 from Ocelot-Social-Community/dependabot/docker/webapp/node-20.1.0-alpine3.17
Bump node from 19.9.0-alpine3.17 to 20.1.0-alpine3.17 in /webapp
b2.6.0-404
2023-05-15 23:20:43 +02:00
fedba26525
fix lint 2023-05-15 23:17:59 +02:00
aadf093402
helmet exception for graphiql 2023-05-15 17:39:22 +02:00
dependabot[bot]
fb2c924083
Bump node from 19.9.0-alpine3.17 to 20.1.0-alpine3.17 in /webapp
Bumps node from 19.9.0-alpine3.17 to 20.1.0-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-15 14:07:15 +00:00
4cb110b6ce
Merge pull request #6284 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/core-7.21.8
Bump @babel/core from 7.21.4 to 7.21.8
b2.6.0-403
2023-05-15 15:59:21 +02:00
dependabot[bot]
a127aee6d5
Bump @babel/core from 7.21.4 to 7.21.8
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.21.4 to 7.21.8.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.8/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-15 13:05:52 +00:00
f3e6fdf9bd
Merge pull request #6296 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/helmet-7.0.0
Bump helmet from 3.22.0 to 7.0.0 in /backend
b2.6.0-402
2023-05-15 14:56:33 +02:00
Markus
998b71aa22 Merge branch 'newsfeed-layout-fixes' of github.com:Ocelot-Social-Community/Ocelot-Social into newsfeed-layout-fixes 2023-05-15 14:53:09 +02:00
Markus
95710fd587 [fix] added custom css to newsfeed layout if less than 3 posts are visible 2023-05-15 14:51:23 +02:00
dependabot[bot]
0e74260bd5
Bump helmet from 3.22.0 to 7.0.0 in /backend
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.22.0 to 7.0.0.
- [Changelog](https://github.com/helmetjs/helmet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.22.0...v7.0.0)

---
updated-dependencies:
- dependency-name: helmet
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-13 01:59:51 +00:00
Markus
c42737a3df
Merge pull request #6279 from Ocelot-Social-Community/6141-fix-z-layer-of-header-elements
fix(webapp):  fix z layer of header elements
b2.6.0-401
2023-05-12 16:51:33 +02:00
Markus
fc82104042 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-05-12 16:50:26 +02:00
Hannes Heine
7894a5f3f3
Merge branch 'master' into 6141-fix-z-layer-of-header-elements 2023-05-12 15:10:19 +02:00
Hannes Heine
24ccdab47f
Merge branch 'master' into newsfeed-layout-fixes 2023-05-12 14:17:27 +02:00
4eb5c9fb65
Merge pull request #6289 from Ocelot-Social-Community/fix-avatar-group-settings
fix(webapp): properly render avatars in group settings
2023-05-12 11:11:46 +02:00
d7a11e2864
Merge branch 'master' into fix-avatar-group-settings 2023-05-08 13:11:18 +02:00
f4efe245a7
properly render avatars in group settings 2023-05-08 13:06:18 +02:00