Moriz Wahl
|
e3eaaf4435
|
fix tests for contribution form
|
2023-05-23 11:04:01 +02:00 |
|
Moriz Wahl
|
59e7f8c0d2
|
fix post teaser unit tests and linting
|
2023-05-22 17:12:32 +02:00 |
|
Moriz Wahl
|
30ce9e8460
|
add description to migration
|
2023-05-22 17:06:32 +02:00 |
|
Moriz Wahl
|
16e0551fd9
|
Merge branch 'master' into event-master
|
2023-05-22 14:47:08 +02: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 |
|
elweyn
|
5544f453a6
|
Backend removed eventLocation, frontend fixes
|
2023-05-17 22:12:08 +02:00 |
|
Markus
|
df86812fc0
|
added missing eventLocationName to _EventInputs
|
2023-05-17 16:17:02 +02:00 |
|
Markus
|
7c37d9f9ef
|
added conditional check for event time, code syntaxes
|
2023-05-17 15:32:49 +02:00 |
|
Markus
|
a59674ecb6
|
Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master
|
2023-05-17 13:41:37 +02:00 |
|
Alexander Friedland
|
cacf08afee
|
Merge branch 'master' into event-master
|
2023-05-17 11:05:37 +02:00 |
|
ogerly
|
6b6eeab655
|
fix lint
|
2023-05-17 11:03:10 +02:00 |
|
ogerly
|
ff559e71db
|
merge #6045 #6267, resolve conflicts, fix save image
|
2023-05-17 11:01:49 +02:00 |
|
ogerly
|
b4275f44cb
|
Merge branch '6045-add-event-info-to-post' into event-master
|
2023-05-17 10:11:39 +02:00 |
|
ogerly
|
245035549c
|
Merge branch '6267-eventteaser-design-optimization' into event-master
|
2023-05-17 09:40:10 +02:00 |
|
ogerly
|
b421202e59
|
resolve conflict
|
2023-05-17 09:22:15 +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 |
|
elweyn
|
a403ffd23c
|
Merge branch '6266-Event-create-design-optimization' into 6267-eventteaser-design-optimization
|
2023-05-13 11:51:03 +02:00 |
|
elweyn
|
affd2e5dd8
|
Merge branch 'event-master' into 6266-Event-create-design-optimization
|
2023-05-13 11:50:34 +02:00 |
|
Hannes Heine
|
55f6badeaf
|
Merge branch 'master' into event-master
|
2023-05-13 11:48:47 +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 |
|
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 |
|
Markus
|
0c2c199e74
|
added linting
|
2023-05-10 15:26:33 +02:00 |
|
Markus
|
092feb5ee7
|
[webapp] added event info to post page
|
2023-05-10 15:20:01 +02:00 |
|
Markus
|
f2256c8146
|
[webapp] added event infos to postteaser component
|
2023-05-10 14:12:07 +02:00 |
|
Markus
|
03a07f3c13
|
[webapp] added more event info to the postquery for event teaser
|
2023-05-10 13:56:29 +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
b2.6.0-399
2.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 |
|
Alexander Friedland
|
2426f5db88
|
Merge branch 'master' into 6266-Event-create-design-optimization
|
2023-04-27 08:41:41 +02:00 |
|
ogerly
|
d56479dbea
|
Merge branch '6266-Event-create-design-optimization' into event-master
|
2023-04-26 13:51:25 +02:00 |
|
