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
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
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
entermex
f3ea0ea6ef Fix group list number to six 2023-05-19 12:41:39 +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
Ulf Gebhardt
2e410b6c13
Merge branch 'master' into update-database 2023-05-16 13:19:15 +02:00
Ulf Gebhardt
4ce324cba2
corrected old query format 2023-05-16 12:11:21 +02:00
Ulf Gebhardt
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
Ulf Gebhardt
5e758328f1
write query for delete operations 2023-05-16 11:54:36 +02:00
Ulf Gebhardt
46af4d80d0
new query format 2023-05-16 11:54:22 +02:00
Ulf Gebhardt
c2583bad0c
new query format 2023-05-16 11:54:10 +02:00
Ulf Gebhardt
d86efa0a55
use write permissions for delete queries 2023-05-16 11:54:01 +02:00
Ulf Gebhardt
33b18a5431
fix searches 2023-05-16 11:53:40 +02:00
Ulf Gebhardt
f68b3ccbda
Merge branch 'master' into fix-graphiql-helmet 2023-05-16 10:46:04 +02:00
Ulf Gebhardt
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
Ulf Gebhardt
8d51d906b2
Merge branch 'master' into fix-graphiql-helmet 2023-05-16 00:47:20 +02:00
Ulf Gebhardt
44700f8a41
lint + comment 2023-05-16 00:43:37 +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
Ulf Gebhardt
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
Ulf Gebhardt
a326b2777f
fix migrations 2023-05-16 00:38:02 +02:00
Ulf Gebhardt
168aed6233
migrate kubernetes cluster(untested) 2023-05-16 00:15:41 +02:00
Ulf Gebhardt
3c023e877c
fix broken query due to outdated query format 2023-05-15 23:55:52 +02:00
Ulf Gebhardt
a9b06e6779
allow migration of neo4j database in docker 2023-05-15 23:55:38 +02:00
Ulf Gebhardt
09dcd1d5a7
update neo4j docker file 2023-05-15 23:55:16 +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
Ulf Gebhardt
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
Ulf Gebhardt
fedba26525
fix lint 2023-05-15 23:17:59 +02:00
Ulf Gebhardt
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
Ulf Gebhardt
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
Ulf Gebhardt
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
Ulf Gebhardt
e9756f7f60
Merge branch 'master' into fix-avatar-seeding 2023-05-15 13:24:58 +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
Markus
fc82104042 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-05-12 16:50:26 +02:00