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

13869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
d073a2a948
Merge branch 'master' into create-a-component-chat-scaffholding 2023-07-06 11:36:01 +02:00
ogerly
1cb486cc8c chat-modul structur, add store state roomID 2023-07-06 11:30:55 +02:00
ogerly
9b4a71bd96 add store chat-modul, showChatModul 2023-07-06 07:17:38 +02:00
ogerly
9a690d6051 single chat modul in default template 2023-07-05 17:17:54 +02:00
ogerly
c8af90f0a6 add chat base-button in header menu 2023-07-05 15:51:55 +02:00
ogerly
34d38b117e remove client chat page, make chat components 2023-07-05 13:48:30 +02:00
Markus
708c769a3b added chat code as plugin for client rendering 2023-07-04 21:42:14 +02:00
Moriz Wahl
29bbe25020
Merge pull request #6477 from Ocelot-Social-Community/fix-subscriptions 
fix(backend): subscriptions
b2.7.0-460 		2023-07-03 11:45:09 +02:00
Moriz Wahl
b3fec7bf6f
Merge branch 'master' into fix-subscriptions 2023-06-21 19:28:27 +02:00
Moriz Wahl
2f2b50249f
Merge pull request #6472 from Ocelot-Social-Community/fix-reports-seed 
fix(backend): seed reports
b2.7.0-459 		2023-06-21 19:20:30 +02:00
Moriz Wahl
d3b3e50278
Merge branch 'master' into fix-reports-seed 2023-06-21 17:59:31 +02:00
Moriz Wahl
ed9fefbf76
Update backend/src/db/seed.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-06-21 17:59:20 +02:00
Ulf Gebhardt
700fe68f35
Merge pull request #6470 from Ocelot-Social-Community/remove-activity-pub 
refactor(backend): remove activity pub
b2.7.0-458 		2023-06-21 17:07:12 +02:00
Moriz Wahl
a498110ee4
Merge branch 'master' into fix-reports-seed 2023-06-21 16:41:59 +02:00
Ulf Gebhardt
0e1dea6002
Merge branch 'master' into remove-activity-pub 2023-06-21 16:26:24 +02:00
Wolfgang Huß
087bf390d9
Merge pull request #6441 from Ocelot-Social-Community/6439-fix-terms-and-condition+data-privacy-links-on-registration 
fix(webapp): change registration `terms and conditions`, `data privacy` links to use `page-params-link`
b2.7.0-457 		2023-06-21 16:16:56 +02:00
Moriz Wahl
badaac8527 activate clean database again 2023-06-21 14:33:41 +02:00
Moriz Wahl
c9135d321d fix notification added subscription 2023-06-21 14:31:16 +02:00
Moriz Wahl
07d10c8e4c fix(backend): notifications 2023-06-21 14:29:56 +02:00
Wolfgang Huß
acbaf301bb
Merge branch 'master' into 6439-fix-terms-and-condition+data-privacy-links-on-registration 2023-06-21 14:09:32 +02:00
Moriz Wahl
3451a16ab4 fix(backend): seed reports 2023-06-21 11:14:59 +02:00
Moriz Wahl
9e4b2d18c4
Merge pull request #6471 from Ocelot-Social-Community/message-properties 
feat(backend): message properties
b2.7.0-456 		2023-06-21 09:56:30 +02:00
Ulf Gebhardt
4d91b3f5b0
Merge branch 'master' into remove-activity-pub 2023-06-21 06:55:22 +02:00
Moriz Wahl
02ffdda69d
Merge branch 'master' into message-properties 2023-06-20 20:24:28 +02:00
Moriz Wahl
6904668a22
Merge pull request #6451 from Ocelot-Social-Community/room-properties 
feat(backend): room properties
b2.7.0-455 		2023-06-20 20:24:09 +02:00
Ulf Gebhardt
42ea5a3025
increase coverage reequirement to 70 2023-06-20 19:26:08 +02:00
Moriz Wahl
6a3ec44f4d feat(backend): message properties 2023-06-20 19:19:54 +02:00
Ulf Gebhardt
ec4eff86f7
remove activity pub middleware 2023-06-20 18:47:50 +02:00
Ulf Gebhardt
6adffd7c6b
remove well-known properly 2023-06-20 18:44:30 +02:00
Ulf Gebhardt
c063682560
remove activity pub related stuff - since its unused 2023-06-20 18:39:43 +02:00
Moriz Wahl
45602119ca
Merge branch 'master' into room-properties 2023-06-20 16:47:53 +02:00
Moriz Wahl
c66e958760
Merge pull request #6469 from Ocelot-Social-Community/fix-create-message 
fix(backend): create message mutation
b2.7.0-454 		2023-06-20 16:47:36 +02:00
Moriz Wahl
9062e1d248 Merge branch 'master' into room-properties 2023-06-20 16:40:19 +02:00
Moriz Wahl
bbfaba83ee fix(backend): create message mutation 2023-06-20 16:05:19 +02:00
Wolfgang Huß
56816f0d98 Simplify 'forceTargetBlank' in call of 'page-params-link' 2023-06-20 14:22:26 +02:00
Wolfgang Huß
853f6f8fad Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6439-fix-terms-and-condition+data-privacy-links-on-registration 2023-06-20 14:14:40 +02:00
Wolfgang Huß
29a05efadb Fix linting 2023-06-20 13:56:52 +02:00
ogerly
932ad7037f add apollo messages query 2023-06-20 13:09:12 +02:00
ogerly
01ce770b2d Merge branch 'master' into 6398-Create-a-vue-advanced-chat-component 2023-06-20 12:47:33 +02:00
Moriz Wahl
5567ae475a
Merge pull request #6450 from Ocelot-Social-Community/messages 
feat(backend): messages
activity-pub b2.7.0-453 		2023-06-20 12:45:06 +02:00
ogerly
a28be72e84 Chat rooms query 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-06-20 12:31:50 +02:00
Ulf Gebhardt
af6f682cff
Merge branch 'master' into 6398-Create-a-vue-advanced-chat-component 2023-06-20 11:47:50 +02:00
Ulf Gebhardt
db413bcbd4
downgrade node version again as it seems to cause problems 2023-06-20 11:44:23 +02:00
Ulf Gebhardt
1ea221ce0c
booleans must be in quotes aswell 2023-06-20 11:44:23 +02:00
dependabot[bot]
b932bd9a02
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-20 11:44:23 +02:00
dependabot[bot]
2d7119825f
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-20 11:44:23 +02:00
dependabot[bot]
6f765f758b
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-20 11:44:23 +02:00
dependabot[bot]
2c20748e28
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-20 11:44:23 +02:00
Ulf Gebhardt
0f01393eaa
fixed report queries 2023-06-20 11:44:23 +02:00
Ulf Gebhardt
7b0ae9f750
use list comprehension instead of filter(not supported anymore in 4.4) 2023-06-20 11:44:23 +02:00