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
9c052ea1cd
start with chat notifications 2023-07-17 11:38:06 +02:00
Moriz Wahl
8e3402a7ef
Update backend/src/schema/types/type/Room.gql 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-07-17 11:33:59 +02:00
Ulf Gebhardt
32eff1eab2
Merge pull request #6580 from Ocelot-Social-Community/chat-last-seen-webapp 
feat(webapp): chat last seen in webapp
b2.7.0-490 		2023-07-17 10:54:41 +02:00
Ulf Gebhardt
d75566a8ce
sender user 2023-07-17 10:30:12 +02:00
Ulf Gebhardt
b6fe28e1c4
fix test, test pagination properly 2023-07-17 10:29:32 +02:00
Ulf Gebhardt
1e77e9aec0
Merge branch 'master' into unread-rooms-query 2023-07-17 10:23:56 +02:00
Ulf Gebhardt
9ab8fd7561
Merge branch 'master' into chat-last-seen-webapp 2023-07-17 10:10:14 +02:00
Ulf Gebhardt
640e713f0a
Merge pull request #6579 from Ocelot-Social-Community/chat-pagniate-rooms 
feat(webapp): chat paginate rooms
b2.7.0-489 		2023-07-17 10:09:05 +02:00
Ulf Gebhardt
348d56beb1
Merge branch 'master' into chat-pagniate-rooms 2023-07-17 09:33:39 +02:00
Hannes Heine
57418ee18a
Merge pull request #6582 from Ocelot-Social-Community/share-required-files-via-cache-for-e2e-testing 
refactor(other): use cached docker images in github e2e flow to decrease run time of e2e test job runs
b2.7.0-488 		2023-07-17 09:32:01 +02:00
Ulf Gebhardt
121093342b
Merge branch 'master' into chat-pagniate-rooms 2023-07-17 09:30:02 +02:00
mahula
6ab1d24c36 remove pr number step fpm e2e test job 2023-07-17 07:47:49 +02:00
mahula
fe8d4a4cfa reuse pr number from preparation step in e2e test step 2023-07-17 07:46:01 +02:00
mahula
545eb04d6c adapt step namings 2023-07-17 07:43:54 +02:00
mahula
9ba873648e add cache restoring in e2e test step 2023-07-17 07:42:58 +02:00
mahula
690021fcb6 move cypress requirement installation to preparation step 2023-07-17 07:39:57 +02:00
mahula
5ca1e9e648 add docker image building step to e2e test workflow 2023-07-17 07:35:20 +02:00
Ulf Gebhardt
cfc34495a7
Merge branch 'master' into 6557-chat-reactive-language-switch 2023-07-17 01:01:51 +02:00
Ulf Gebhardt
ddc864a433
Merge pull request #6581 from Ocelot-Social-Community/fix-room-image 
fix(webapp): show room header images.
b2.7.0-487 		2023-07-17 00:55:19 +02:00
Ulf Gebhardt
c0dec2c358
Merge branch 'master' into fix-room-image 2023-07-16 20:40:50 +02:00
Hannes Heine
61ce0156d1
Merge branch 'master' into chat-pagniate-rooms 2023-07-16 13:18:35 +02:00
Hannes Heine
a97af3e418
Merge pull request #6561 from Ocelot-Social-Community/chat-seed 
feat(backend): chat seed
b2.7.0-486 		2023-07-16 13:17:25 +02:00
elweyn
5dfdcc9bc2 fix(webapp): show room header images. 2023-07-15 19:00:46 +02:00
Ulf Gebhardt
1e7f579378
adjust tests 2023-07-15 12:51:43 +02:00
Ulf Gebhardt
661c2f1b71
implement room order 2023-07-15 12:51:33 +02:00
Ulf Gebhardt
775a3ddb72
strip datetime down to date in message 2023-07-15 12:35:44 +02:00
Ulf Gebhardt
2d3483dc1b
query additional data for messages 2023-07-15 12:35:26 +02:00
Ulf Gebhardt
66cd66d71a
test room pagination and singleRoom query 2023-07-15 12:03:53 +02:00
Ulf Gebhardt
ab91413bf3
typo 2023-07-15 10:43:08 +02:00
Ulf Gebhardt
0cb45cd8f6
removed refetch message method 2023-07-15 10:42:10 +02:00
Ulf Gebhardt
851dd2e3e6
lint fixes 2023-07-15 10:40:18 +02:00
Ulf Gebhardt
5f4a973e2a
backend allow room filter by id for single rooms 2023-07-15 10:38:35 +02:00
Ulf Gebhardt
f05a0bc544
frontend paginate rooms 2023-07-15 10:38:19 +02:00
dependabot[bot]
ae0c6f12bd
Bump @babel/preset-env from 7.9.5 to 7.22.9 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.9.5 to 7.22.9.
- [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.9/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-15 02:05:07 +00:00
dependabot[bot]
209390a7e0
Bump @babel/core from 7.22.8 to 7.22.9 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.22.8 to 7.22.9.
- [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.9/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-07-15 01:50:34 +00:00
dependabot[bot]
7c3ebf1c1c
Bump @babel/preset-env from 7.22.7 to 7.22.9 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.22.7 to 7.22.9.
- [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.9/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-07-15 01:50:09 +00:00
Ulf Gebhardt
dafdd26eb6
Merge branch 'master' into 6557-chat-reactive-language-switch 2023-07-15 01:39:14 +02:00
Ulf Gebhardt
2947ad635c
Merge branch 'master' into 6534-chat-room-usertag 2023-07-15 01:25:05 +02:00
Moriz Wahl
3d4def7c10
Merge branch 'master' into new-room-properties 2023-07-14 19:56:42 +02:00
Moriz Wahl
db594650f9 feat(webapp): mark messages as seen 2023-07-14 18:53:56 +02:00
Moriz Wahl
c46d0064fc unread rooms query in chat notification 2023-07-14 14:50:43 +02:00
Moriz Wahl
d7746e5904 clean db after all 2023-07-14 14:44:41 +02:00
Moriz Wahl
09be4d3442 test unread rooms query 2023-07-14 14:40:38 +02:00
Moriz Wahl
f4567b14ff feat(backend): unread rooms query 2023-07-14 13:25:57 +02:00
entermex
138b851737 Change color red to green on cancel buttons of post and comments 2023-07-14 13:05:07 +02:00
Moriz Wahl
4310b3fa48 create message mutation returns full message object 2023-07-14 12:51:54 +02:00
Moriz Wahl
b9b9fea1dd test unread count 2023-07-14 12:38:46 +02:00
Moriz Wahl
1fd67aa581 add unreadCount property 2023-07-14 12:34:12 +02:00
Moriz Wahl
2fe93892a1 full room object for create room mutation 2023-07-14 12:21:40 +02:00
Moriz Wahl
1d92b40f50 lastMessage in room working 2023-07-14 11:52:51 +02:00