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

5326 Commits

Author SHA1 Message Date
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
Wolfgang Huß
64f159e82f Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map 2023-06-27 12:54:15 +02:00
Wolfgang Huß
f06369ad7c Setup displaying events on map – first step 2023-06-27 12:52:18 +02:00
Moriz Wahl
b3fec7bf6f
Merge branch 'master' into fix-subscriptions 2023-06-21 19:28:27 +02:00
Moriz Wahl
c9135d321d fix notification added subscription 2023-06-21 14:31:16 +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
a28be72e84 Chat rooms query 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-06-20 12:31:50 +02:00
Ulf Gebhardt
db413bcbd4
downgrade node version again as it seems to cause problems 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
elweyn
5a3b2bfb07
chore(other): create new tag 2.7.0 2023-06-20 11:41:21 +02:00
elweyn
cb0f97238c Refactor code to computed methods. 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2023-06-20 11:10:57 +02:00
ogerly
0330cbe900 import chat prework 2023-06-20 11:04:44 +02:00
Ulf Gebhardt
f9e5fce546
downgrade node version again as it seems to cause problems 2023-06-17 14:04:54 +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
ogerly
0f7312d21b vue-advanced-chat implemented and game page set up 2023-06-15 15:54:34 +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
Wolfgang Huß
53d3a921bf Force target '_blank' in registration 'terms and conditions', 'data privacy' links by 'PageParamsLink' 2023-06-14 13:20:56 +02:00
Wolfgang Huß
c5ec22a6f2 Change registration 'term and conditions', 'data privacy' link to use 'PageParamsLink' that external pages can be used 2023-06-14 12:08:36 +02:00
elweyn
de3c2faa58 chore(other): create new tag 2.7.0 2023-06-14 10:06:13 +02:00
Wolfgang Huß
1390e4ff36 Change date time range on post teaser to be under eachother 2023-06-08 16:42:35 +02:00
Wolfgang Huß
45f3ec743e Remove on locale 'eventIsOnline' part '… event' to have just 'Online' 2023-06-08 16:28:22 +02:00
Wolfgang Huß
c4a12a3a4a Merge branch 'merge-6336-into-6339-optimize-event-create-and-update' of github.com:Ocelot-Social-Community/Ocelot-Social into 6379-fix-event-teaser-date-from-start-to-end 2023-06-08 16:10:19 +02:00
elweyn
e7cee28087 Remove gray box under date-picker. 2023-06-08 11:19:20 +02:00
elweyn
866079d307 Fix linting. 2023-06-08 09:49:42 +02:00
elweyn
5b40122b0e Remove async of cypress command and add contribution default value to post edit _id. 2023-06-08 09:44:11 +02:00
Wolfgang Huß
65b8780786
Merge branch 'master' into merge-6336-into-6339-optimize-event-create-and-update 2023-06-07 21:34:47 +02:00
Wolfgang Huß
2f08cd5d95 Merge branch 'merge-6336-into-6339-optimize-event-create-and-update' of github.com:Ocelot-Social-Community/Ocelot-Social into 6379-fix-event-teaser-date-from-start-to-end 2023-06-07 20:13:16 +02:00
Wolfgang Huß
9ee47c1362 Fulfill Mogges suggestions 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2023-06-07 20:10:10 +02:00
Moriz Wahl
a669f799ae remove emacs backup 2023-06-07 17:48:06 +02:00
Moriz Wahl
a8659e37bd check required in valiator 2023-06-07 17:46:06 +02:00
Wolfgang Huß
f55464f957 Merge branch 'merge-6336-into-6339-optimize-event-create-and-update' of github.com:Ocelot-Social-Community/Ocelot-Social into 6379-fix-event-teaser-date-from-start-to-end 2023-06-07 16:52:05 +02:00
elweyn
107a9491ca Correct some locales. 2023-06-07 16:47:30 +02:00
elweyn
ae2aec0d8a Fix eventLocationName validator and remove eventLocationName of query parameters if eventIsOnline true. 2023-06-07 16:43:38 +02:00
Wolfgang Huß
04290921fc Move event location name to an own component 2023-06-07 16:40:51 +02:00
Wolfgang Huß
ed2cdff830 Fix class namimg 2023-06-07 16:12:39 +02:00
Wolfgang Huß
2a4046555b Cleanup 2023-06-07 15:47:34 +02:00
Wolfgang Huß
52cf19d5fc Rename component 'DateRange' to 'DateTimeRange' 2023-06-07 15:46:18 +02:00
Wolfgang Huß
9346a6b543 Refine date time range 2023-06-07 15:34:17 +02:00
Wolfgang Huß
a7fc5536c5 Use iSameDate 2023-06-07 14:49:47 +02:00
Wolfgang Huß
7ad74b1398 Move date time range to an own component 2023-06-07 14:07:22 +02:00
elweyn
4e43b77da2 Add custom error messages for events. 
Co-authored-by: maeckes <markus@infinity.labs.ooo>
 2023-06-07 12:55:21 +02:00
Moriz Wahl
2c31453bb0 test event data form 2023-06-07 11:50:46 +02:00
Ulf Gebhardt
33bb92de1a
Merge branch 'master' into fix-coverage 2023-06-07 10:56:46 +02:00
elweyn
261dc21970 Remove unused InputCheckbox component. 2023-06-07 10:51:35 +02:00
elweyn
da71b4e952 Make form interactive.. 2023-06-07 10:49:27 +02:00