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

13956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
1ee8e488a3
Update backend/src/schema/resolvers/messages.spec.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-06-20 11:04:43 +02:00
Moriz Wahl
8f86d6fc82 remove message filter from schema, use apoc create uuid 2023-06-20 10:54:41 +02:00
Moriz Wahl
31d81aa2dd Merge branch 'master' into messages 2023-06-20 10:47:27 +02:00
Moriz Wahl
aa6a2e602b
Merge pull request #6444 from Ocelot-Social-Community/rooms 
feat(backend): rooms
b2.7.0-452 		2023-06-20 10:45:46 +02:00
Moriz Wahl
23c0ea48a7 Merge branch 'rooms' of github.com:Ocelot-Social-Community/Ocelot-Social into rooms 2023-06-20 09:25:54 +02:00
Moriz Wahl
85950843f7 add spaces 2023-06-20 09:25:23 +02:00
Moriz Wahl
62b9b3c55a
Merge branch 'master' into rooms 2023-06-20 09:21:27 +02:00
Moriz Wahl
3a95e25e1c add test for room creation with existing user id 2023-06-20 09:18:50 +02:00
Moriz Wahl
66652cf74e remove doubled await 2023-06-20 09:10:52 +02:00
Moriz Wahl
f86367e340 fix typo, comment room filter 2023-06-20 09:09:27 +02:00
Moriz Wahl
8063e58ef2 use apoc.create.uuid to set id 2023-06-20 09:02:32 +02:00
Moriz Wahl
0cdbf17fbf remove semicolon 2023-06-20 08:53:24 +02:00
Ulf Gebhardt
7cb19698ff
Merge pull request #6464 from Ocelot-Social-Community/fix-neo4j-config-map 
fix(other): neo4j config map & node version
b2.7.0-451 		2023-06-17 14:39:09 +02:00
Ulf Gebhardt
f9e5fce546
downgrade node version again as it seems to cause problems 2023-06-17 14:04:54 +02:00
Ulf Gebhardt
69c8a7cca4
booleans must be in quotes aswell 2023-06-17 13:24:21 +02:00
Ulf Gebhardt
aa7ae7dc34
Merge pull request #6413 from Ocelot-Social-Community/dependabot/npm_and_yarn/babel/core-7.22.5 
Bump @babel/core from 7.22.1 to 7.22.5
b2.7.0-450 		2023-06-17 12:47:41 +02:00
dependabot[bot]
8f5e4ea168
Bump @babel/core from 7.22.1 to 7.22.5 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.1 to 7.22.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.22.5/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-06-17 10:07:12 +00:00
Ulf Gebhardt
57d3e114c7
Merge pull request #6306 from Ocelot-Social-Community/update-database 
refactor(database): update neo4j to 4.4
b2.7.0-449 		2023-06-17 12:04:49 +02:00
Ulf Gebhardt
ab7749bd94
Merge branch 'master' into update-database 2023-06-17 11:21:55 +02:00
Ulf Gebhardt
09060f52fb
Merge pull request #6414 from Ocelot-Social-Community/dependabot/npm_and_yarn/cypress-12.14.0 
Bump cypress from 12.13.0 to 12.14.0
b2.7.0-448 		2023-06-17 11:21:32 +02:00
dependabot[bot]
e8dcba6074
Bump cypress from 12.13.0 to 12.14.0 
Bumps [cypress](https://github.com/cypress-io/cypress) from 12.13.0 to 12.14.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v12.13.0...v12.14.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-17 00:27:49 +00:00
Ulf Gebhardt
841f8fbe63
Merge pull request #6409 from Ocelot-Social-Community/dependabot/docker/backend/node-20.3.0-alpine3.17 
Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /backend
b2.7.0-447 		2023-06-17 02:25:08 +02:00
dependabot[bot]
22d7116e4b
Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /backend 
Bumps node from 20.2.0-alpine3.17 to 20.3.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-06-16 22:53:48 +00:00
Ulf Gebhardt
8dd5345d8c
Merge pull request #6408 from Ocelot-Social-Community/dependabot/docker/webapp/node-20.3.0-alpine3.17 
Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /webapp
b2.7.0-446 		2023-06-17 00:52:55 +02:00
dependabot[bot]
12af4c23b2
Bump node from 20.2.0-alpine3.17 to 20.3.0-alpine3.17 in /webapp 
Bumps node from 20.2.0-alpine3.17 to 20.3.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-06-16 21:45:06 +00:00
Ulf Gebhardt
75bd7dbc36
fixed report queries 2023-06-16 23:00:59 +02:00
Ulf Gebhardt
df139c9937
use list comprehension instead of filter(not supported anymore in 4.4) 2023-06-16 15:34:27 +02:00
Ulf Gebhardt
eb6825b6e6
remove listen address 7474 from docker since its default value 2023-06-16 15:14:27 +02:00
Ulf Gebhardt
23c2be3093
Merge branch 'master' into update-database 2023-06-16 15:02:58 +02:00
Moriz Wahl
c68339fedf roomName property 2023-06-16 13:07:10 +02:00
Moriz Wahl
cd23b88dd6 room users complete 2023-06-16 12:53:48 +02:00
Moriz Wahl
6a6efd5a23 override user._id with user.id to not expose internal db id 2023-06-16 12:38:13 +02:00
Moriz Wahl
64120a0009 _id property for user 2023-06-16 09:13:29 +02:00
Moriz Wahl
5d4c4f3c98 roomId property 2023-06-16 09:08:31 +02:00
Moriz Wahl
90bf1881f7 message query is working 2023-06-15 16:45:38 +02:00
Moriz Wahl
610d538ca9 message query is not working as expected 2023-06-15 16:26:55 +02:00
ogerly
0f7312d21b vue-advanced-chat implemented and game page set up 2023-06-15 15:54:34 +02:00
Ulf Gebhardt
e657b8bf7d
Merge pull request #6448 from Ocelot-Social-Community/typescript-fix 
fix(backend): typescript fix
b2.7.0-445 		2023-06-15 14:33:41 +02:00
Ulf Gebhardt
c1669abac0
correct nodemon watch in dev:debug 2023-06-15 13:58:38 +02:00
Ulf Gebhardt
5dd4a1af80
comment to explain the bug 2023-06-15 13:58:26 +02:00
Ulf Gebhardt
09ef532838
converted two more js files to ts 2023-06-15 13:57:29 +02:00
Ulf Gebhardt
0432d3277e
fixed why production didnt work 2023-06-15 13:57:13 +02:00
Moriz Wahl
0e4cf0ecef
Merge branch 'master' into rooms 2023-06-15 10:44:41 +02:00
Ulf Gebhardt
a43a4b2c5d
Merge pull request #6434 from Ocelot-Social-Community/ts-all 
refactor(backend): migrate completely to typescript
b2.7.0-444 		2023-06-15 01:38:48 +02:00
Moriz Wahl
d2beca22c9 set up unit tests for messages 2023-06-14 17:27:42 +02:00
Moriz Wahl
ae131cc656 add permissions for messages 2023-06-14 16:15:28 +02:00
Moriz Wahl
bb8a745566 simple message create mutation and query 2023-06-14 16:14:19 +02:00
Moriz Wahl
5b859bbcb5 test roomms resolver 2023-06-14 15:38:05 +02:00
Moriz Wahl
a51f357357 filter that only the rooms of the current user are returned 2023-06-14 15:00:23 +02:00
Wolfgang Huß
82c6babc84 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6439-fix-terms-and-condition+data-privacy-links-on-registration 2023-06-14 13:26:39 +02:00