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
mahula
e2da08c0ff
Merge branch 'master' into 6501-featurefrontend-event-creation-page 2023-07-11 15:59:33 +02:00
mahula
0154f7bcd5
Merge pull request #6526 from Ocelot-Social-Community/refactor-webapp-workflow 
refactor(other): refine webapp github workflow conditions
b2.7.0-473 		2023-07-11 15:58:57 +02:00
Ulf Gebhardt
a6af78f777
reduce coverage to 67% 2023-07-11 15:44:16 +02:00
Ulf Gebhardt
6255d9b11b
Merge branch 'master' into refactor-seed 2023-07-11 15:42:44 +02:00
mahula
8d962c738a
Merge branch 'master' into refactor-webapp-workflow 2023-07-11 15:34:45 +02:00
mahula
a7260e8714 update cypress run scripts in package.json 2023-07-11 15:02:51 +02:00
mahula
82999d377d disable waiting for actionability at post creation image dropzone 2023-07-11 15:00:16 +02:00
Wolfgang Huß
a97d65da3c
Merge pull request #6532 from Ocelot-Social-Community/docu-deployment-js-files 
docs(other): update TODO-next-update.md for 2.7.0-470
b2.7.0-472 		2023-07-11 14:59:31 +02:00
Markus
e33091b814 fix linting 2023-07-11 14:36:24 +02:00
Markus
a1b6576162 [refactor] adjusted label texts for filter menu 2023-07-11 14:26:45 +02:00
Markus
e81254e531 [refactor] changed button layout in filter menu 2023-07-11 14:26:19 +02:00
Markus
7c56ad9728 [refactor] removed hr in categories filter component 2023-07-11 14:10:39 +02:00
Markus
e1a9b5b7f7 [refactor] added new filter menu headline and adjusted some filter labels 2023-07-11 14:07:36 +02:00
Markus
0493a2c6c0 [refactor] changed filter layout in filter menu 2023-07-11 14:06:29 +02:00
Markus
89caf7b678 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-07-11 13:43:41 +02:00
Ulf Gebhardt
453ffa4f2b
Merge branch 'master' into docu-deployment-js-files 2023-07-11 13:29:48 +02:00
Ulf Gebhardt
ab5b7a0b8a
Merge pull request #6530 from Ocelot-Social-Community/fix-backend-room-with-self 
fix(backend): chat - do not allow to create room with self
b2.7.0-471 		2023-07-11 13:29:35 +02:00
Wolfgang Huß
2ffe3a2fd4 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map 2023-07-11 13:27:36 +02:00
Wolfgang Huß
c3912304f4 Fix formating 2023-07-11 13:24:55 +02:00
Ulf Gebhardt
1a3f11ac1f
lint locales 2023-07-11 13:23:32 +02:00
Wolfgang Huß
737a8f4380 Revert "Try to filter only for events with location" 
This reverts commit f247e6bd7b7554442493b799780186b916890043.
 2023-07-11 13:20:38 +02:00
Wolfgang Huß
a427b21948 Renew submodule 'stage.ocelot.social' 2023-07-11 13:19:35 +02:00
Ulf Gebhardt
40dea17360
update TODO-next-update.md for 2.7.0-470 2023-07-11 13:05:01 +02:00
Ulf Gebhardt
a4bb523cb4
unit test for error when creating room with self 2023-07-11 12:57:37 +02:00
mahula
5b73dc8e58 fix typo 2023-07-11 12:33:54 +02:00
Wolfgang Huß
f217c1d63c Replace properties.about by properties.description on map 2023-07-11 12:22:07 +02:00
Wolfgang Huß
11afa1f6d5 Simplify the map legend 2023-07-11 12:14:21 +02:00
Ulf Gebhardt
dd4e6bf2dc
fix open chat functionality after relog co-authored-by: Ogerly <https://github.com/ogerly> 2023-07-11 12:13:46 +02:00
mahula
bb53ee70da
Merge branch 'master' into 6375-refactor-cypress-migrate-from-cypress-file-upload-to-selectfile 2023-07-11 11:56:40 +02:00
Markus
c99bbe3708 fixed linting 2023-07-11 11:41:52 +02:00
Markus
8551cbd896 [design] adjusted single room chat window style/layout 2023-07-11 11:37:33 +02:00
Wolfgang Huß
6c32eb918d Add markers for events to map 2023-07-11 11:33:24 +02:00
Markus
91b2961562 [feature] adjusted avatar style for chat if no image is available 2023-07-11 11:31:00 +02:00
mahula
242619d21b remove unnecessary cypress code from step definitions 2023-07-11 11:19:47 +02:00
Ulf Gebhardt
073adbe48c
do not allow to create room with self 2023-07-11 11:19:01 +02:00
mahula
f44dda4127 fix file path 2023-07-11 10:30:20 +02:00
Markus
fade2eed21 [feature] added close button to the single room chat window 2023-07-11 10:23:44 +02:00
Markus
33f5746220 merged master 2023-07-11 10:19:17 +02:00
mahula
d42cac30c8 add file content to file selection in test step 2023-07-11 09:59:38 +02:00
Markus
2cff87e1cf Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-07-11 09:56:50 +02:00
Wolfgang Huß
7fa970ad1a Add event to map legend 2023-07-11 09:43:11 +02:00
mahula
4efb6463a0 adapt feature step to selectFile 2023-07-11 08:42:08 +02:00
mahula
c1a4ba12da adapt feature step to selectFile 2023-07-10 21:58:53 +02:00
Ulf Gebhardt
1ee2dc70bb
Merge pull request #6524 from Ocelot-Social-Community/frontend-messages 
feat(webapp): chat message capability
b2.7.0-470 		2023-07-10 20:56:59 +02:00
mahula
73f6bc6421 remove package cypress-file-upload from e2e testing 2023-07-10 20:41:21 +02:00
Ulf Gebhardt
3134c7311c
Merge branch 'master' into frontend-messages 2023-07-10 19:44:27 +02:00
mahula
31da4c597b fix webapp github workflow conditions 2023-07-10 19:14:20 +02:00
mahula
728fd79579 set cypress test retries to 0 2023-07-10 18:42:06 +02:00
mahula
753e60fef1
Merge branch 'master' into refactor-webapp-workflow 2023-07-10 18:22:21 +02:00
mahula
5afd0f6bb4
Merge pull request #6368 from Ocelot-Social-Community/dependabot/npm_and_yarn/faker-js/faker-8.0.2 
chore(backend): bump @faker-js/faker from 5.1.0 to 8.0.2
b2.7.0-469 		2023-07-10 18:20:17 +02:00