13657 Commits

Author SHA1 Message Date
Wolfgang Huß
29a05efadb Fix linting 2023-06-20 13:56:52 +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
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
Hannes Heine
2904f95b1a
Merge pull request #6440 from Ocelot-Social-Community/release-2.7.0
chore(release): v2.7.0
b2.7.0-443 2.7.0
2023-06-14 10:45:32 +02:00
elweyn
de3c2faa58 chore(other): create new tag 2.7.0 2023-06-14 10:06:13 +02:00
Wolfgang Huß
2b7cdaabf6
Merge pull request #6385 from Ocelot-Social-Community/6379-fix-event-teaser-date-from-start-to-end
fix(webapp): fix event teaser date from start to end by new components
b2.6.0-442
2023-06-08 21:04:50 +02:00
Hannes Heine
f0c490455d
Merge branch 'master' into 6379-fix-event-teaser-date-from-start-to-end 2023-06-08 20:14:29 +02:00
Hannes Heine
3cfc5e30a5
Merge pull request #6381 from Ocelot-Social-Community/merge-6336-into-6339-optimize-event-create-and-update
refactor(webapp): optimize create and update event form
b2.6.0-441
2023-06-08 20:14:00 +02:00
Wolfgang Huß
0fa735d764 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 19:49:17 +02:00
elweyn
31e1efd356 Remove cypress changes. 2023-06-08 19:45:58 +02:00
Wolfgang Huß
465e150fb5 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 18:47:41 +02:00
Hannes Heine
719f7c52b6
Merge branch 'master' into merge-6336-into-6339-optimize-event-create-and-update 2023-06-08 18:45:55 +02:00
Moriz Wahl
b7d995e9db
Merge pull request #6405 from Ocelot-Social-Community/show-events-not-ended-yet
feat(backend): show events not ended yet
2023-06-08 18:45:40 +02:00
Moriz Wahl
02ef59184c check if filter is present 2023-06-08 17:58:52 +02:00
Moriz Wahl
0d6ea1d7ba
Merge branch 'master' into show-events-not-ended-yet 2023-06-08 17:30:20 +02:00
Moriz Wahl
ecf5e85e63
Merge pull request #6396 from Ocelot-Social-Community/migrate-postType-to-post
feat(backend): migration to add postType property to existing posts
b2.6.0-439
2023-06-08 17:30:07 +02:00
Moriz Wahl
939e3cd2b0
Merge branch 'master' into migrate-postType-to-post 2023-06-08 16:45:54 +02:00
Moriz Wahl
f665324b52
Merge pull request #6391 from Ocelot-Social-Community/seed-posts-as-articles-2
feat(backend): seed events
b2.6.0-438
2023-06-08 16:45:40 +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
Moriz Wahl
1d903798cd ensure that __typename of Post is a known value. labels(resource)[0] may return Article or Event in the case of Post 2023-06-08 16:01:27 +02:00
Moriz Wahl
39ed8f1b81 feat(backend): filter for event end date as well 2023-06-08 14:24:00 +02:00
Moriz Wahl
44e2c1adf7 feat(backend): migration to add postType property to existing posts 2023-06-08 14:00:04 +02:00
Moriz Wahl
09807fb99f seed events 2023-06-08 13:46:22 +02:00
Moriz Wahl
e33e97df75 neode creates posts with postType property 'Article' as default 2023-06-08 13:03:48 +02:00
mahula
02cd897947 set default cypress timeout up and merge get and contain 2023-06-08 13:01:07 +02:00
elweyn
abc272bfd9 Set timeout for page load to 180000. 2023-06-08 12:06:40 +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
130a3de45c Merge branch 'merge-6336-into-6339-optimize-event-create-and-update' of github.com:Ocelot-Social-Community/Ocelot-Social into merge-6336-into-6339-optimize-event-create-and-update 2023-06-07 17:46:44 +02:00
Moriz Wahl
a8659e37bd check required in valiator 2023-06-07 17:46:06 +02:00
Wolfgang Huß
438f8c101a 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 17:21:29 +02:00
Wolfgang Huß
2f87ea0de7 Fix linting in backend 2023-06-07 17:21:06 +02:00
elweyn
e18baf34f3 Fix linting of backend. 2023-06-07 17:09:19 +02:00
elweyn
930c1f219b Fix linting of webapp. 2023-06-07 17:08:31 +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
elweyn
387fa9bfcb Fix events helper. 2023-06-07 16:03:30 +02:00
Wolfgang Huß
2a4046555b Cleanup 2023-06-07 15:47:34 +02:00