13115 Commits

Author SHA1 Message Date
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
2023-05-22 13:21:07 +02:00
19f2b0ae66
default to empty object in helmet 2023-05-22 12:23:47 +02:00
fef12f51c0
Merge pull request #6303 from Ocelot-Social-Community/fix-graphiql-helmet
fix(backend): helmet + graphiql
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
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
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
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
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
2023-05-15 14:56:33 +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
2023-05-12 16:51:33 +02:00
Hannes Heine
7894a5f3f3
Merge branch 'master' into 6141-fix-z-layer-of-header-elements 2023-05-12 15:10:19 +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
Markus
02566a6e93 fixed hardcoded z-index of overlay, filter and add-btn 2023-05-02 15:49:26 +02:00
Markus
2d262283db Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-05-02 10:02:02 +02:00
a7fec5c1ee
Merge pull request #6271 from Ocelot-Social-Community/v2.6.0
chore(release): v2.6.0
2023-04-27 18:00:43 +02:00
Markus
7728784767 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-04-27 13:43:51 +02:00
5fbdab6888
v2.6.0 2023-04-27 12:33:55 +02:00
54656e5294
Merge pull request #6265 from Ocelot-Social-Community/fix-rebranding-docker-compose
fix(other): docker-compose for rebranding deployment
2023-04-26 11:40:11 +02:00
d675958a1f
fix docker-compose for rebranding deployment 2023-04-26 10:57:07 +02:00
Hannes Heine
58b59051ce
Merge pull request #6259 from Ocelot-Social-Community/default-categories-of-group
feat(webapp): default categories of group for posts in group
2023-04-25 22:11:52 +02:00
Moriz Wahl
f6281960d0
Merge branch 'master' into default-categories-of-group 2023-04-25 20:41:12 +02:00
mahula
c9f2192ebe
Merge pull request #6244 from Ocelot-Social-Community/5441-wrench-refactor-groupform-select-make-a-component
refactor(webapp): make action radius select in group form a reusable component
2023-04-25 20:32:35 +02:00
Moriz Wahl
2e202e401e
Merge branch 'master' into default-categories-of-group 2023-04-25 19:42:51 +02:00
mahula
8fdf89d153
Merge branch 'master' into 5441-wrench-refactor-groupform-select-make-a-component 2023-04-25 19:15:17 +02:00
mahula
531bbc9073 remove option from action radius select 2023-04-25 18:04:52 +02:00
mahula
43ed698036 add missing option to action radius select 2023-04-25 17:31:34 +02:00
mahula
60f18c1167 remove comments 2023-04-25 17:26:36 +02:00
4731971632
Merge pull request #6258 from Ocelot-Social-Community/fix-avatars-in-group-member-list
fix(webapp): show avatar for group members
2023-04-25 16:03:51 +02:00
mahula
7732e2a890
Merge branch 'master' into 5441-wrench-refactor-groupform-select-make-a-component 2023-04-25 15:20:07 +02:00
mahula
28e92c25b7 add unit tests to action radius select 2023-04-25 15:19:00 +02:00
mahula
4e76f0c712 linting 2023-04-25 15:18:07 +02:00
e1fe57c741
Merge branch 'master' into fix-avatars-in-group-member-list 2023-04-25 15:17:16 +02:00
mahula
6298194db3 fix updating of group type and action radius changes to the form 2023-04-25 14:11:00 +02:00
24cbd33f83
Merge pull request #6256 from Ocelot-Social-Community/fix-search-3-chars
fix(webapp): fix search for 3 chars
2023-04-25 14:03:39 +02:00
Moriz Wahl
1a4398eaf9 remove comments 2023-04-25 13:32:42 +02:00
Moriz Wahl
8df7d5d265 get it working 2023-04-25 13:27:25 +02:00
282d701e90
show avatar for group members 2023-04-25 12:44:47 +02:00
Moriz Wahl
3244f3f86d feat(webapp): group categories on posts 2023-04-25 12:35:46 +02:00
bbe77c7ddd
Merge branch 'master' into fix-search-3-chars 2023-04-25 12:02:43 +02:00