2355 Commits

Author SHA1 Message Date
elweyn
d711f90fc1 Add background color definitions
Add background ribbon colors

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: entermex <max@infinity.labs.ooo>
2023-06-07 09:20:19 +02:00
entermex
2ac95c4a4e refactor(webapp): changed color for event-ribbon.
Co-authored-by: Elweyn <heine.hannes@gmail.com>
2023-06-07 09:04:46 +02:00
Moriz Wahl
57de9b35c3 use filterdPostTypes getter 2023-06-07 09:03:18 +02:00
Moriz Wahl
598aa0ad06 recover filteredPostTypes getter 2023-06-07 09:03:18 +02:00
Moriz Wahl
46e37a40ee get things working 2023-06-07 09:03:18 +02:00
Moriz Wahl
755440dc03 refactor components for store changes 2023-06-07 09:03:18 +02:00
Wolfgang Huß
e6c5ba1148 Refactor 'TOGGLE_EVENTS_ENDED' and 'eventsEnded' in store to contain the event start date 2023-06-07 09:03:18 +02:00
Wolfgang Huß
b4e3610918 Fix webapp tests 2023-06-07 09:03:18 +02:00
Wolfgang Huß
576ba65411 Delete file 'filterMenuMixin.js' and move all from there to the files where it's used 2023-06-07 09:03:18 +02:00
Wolfgang Huß
fb926b7281 Move 'eventsEnded' and 'toggleEventsEnded' from file 'filterMenuMixin.js' to the files where it's used 2023-06-07 09:03:18 +02:00
Wolfgang Huß
12f43fd6c7 Replace 'setOrder' by 'toggleOrder' 2023-06-07 09:03:18 +02:00
Wolfgang Huß
890b99cd52 Move 'setUnsetPostTypeFilter' to the store 2023-06-07 09:03:18 +02:00
Wolfgang Huß
0de47d5163 Fix typo of 'buttonLabel' 2023-06-07 09:03:18 +02:00
Wolfgang Huß
b3b5bc5452 Update webapp/components/FilterMenu/OrderByFilter.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-06-07 09:03:18 +02:00
Wolfgang Huß
87c47bc83d Update webapp/components/FilterMenu/OrderByFilter.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-06-07 09:03:18 +02:00
Wolfgang Huß
203b809294 Update webapp/components/FilterMenu/OrderByFilter.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-06-07 09:03:18 +02:00
Wolfgang Huß
240d8b2ff4 Change order of imports in 'FilterMenuComponent.vue' 2023-06-07 09:03:18 +02:00
Wolfgang Huß
df624c37c1 Fix post type filter class name 2023-06-07 09:03:18 +02:00
Wolfgang Huß
6cdd3dd2b9 Implement showing of only ended events on newsfeed 2023-06-07 09:03:18 +02:00
Wolfgang Huß
29cf8323f7 Adjustment for filter button remove 'X' 2023-06-07 09:03:18 +02:00
Wolfgang Huß
451f2221b9 Fix webapp tests 2023-06-07 09:03:17 +02:00
Wolfgang Huß
a230199fec Implement order by start date for events 2023-06-07 09:03:17 +02:00
Wolfgang Huß
feb4051741 Rename post type filters computed in mixin 2023-06-07 09:03:17 +02:00
Wolfgang Huß
6a6abf1a4a Implement mixin for filter menu 2023-06-07 09:03:17 +02:00
Wolfgang Huß
0599558578 Add title 'Creation date' to 'OrderByFilter.vue' 2023-06-07 09:03:17 +02:00
Wolfgang Huß
8f15ddc532 Beautify horizontal line above category buttons in filter menu 2023-06-07 09:03:17 +02:00
Wolfgang Huß
f5611fa841 Add 'All' button to filter menu post type buttons
- Unset post type filter menu button by clicking a set button.
2023-06-07 09:03:17 +02:00
Wolfgang Huß
7854b8a083 Change behavior of filter menu post type buttons to switch between them by click 2023-06-07 09:03:17 +02:00
entermex
e11b4eb28e
Merge branch 'master' into 6290-fix-notification-menu-comment-hash 2023-06-01 22:19:44 +02:00
entermex
6807b6f543 Fix notification menu comment hash 2023-05-25 13:10:32 +02:00
04ab8148f9
lint fixes 2023-05-25 12:41:04 +02:00
2bd8a7ef04
make time selection to be always valid 2023-05-25 11:56:10 +02:00
572272b581
typo 2023-05-25 11:26:31 +02:00
Wolfgang Huß
2ba2da75a3 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master 2023-05-25 09:39:03 +02:00
Markus
87b41769f1 Merge branch 'master' into newsfeed-layout-fixes 2023-05-24 10:17:00 +02:00
Moriz Wahl
9086986053 fix filter menu tests 2023-05-23 11:41:09 +02:00
Moriz Wahl
e3eaaf4435 fix tests for contribution form 2023-05-23 11:04:01 +02:00
Moriz Wahl
59e7f8c0d2 fix post teaser unit tests and linting 2023-05-22 17:12:32 +02:00
Markus
dfd84f921c [fix] adds white space after mention in comment editor 2023-05-19 15:15:41 +02:00
elweyn
5544f453a6 Backend removed eventLocation, frontend fixes 2023-05-17 22:12:08 +02:00
Markus
df86812fc0 added missing eventLocationName to _EventInputs 2023-05-17 16:17:02 +02:00
ogerly
6b6eeab655 fix lint 2023-05-17 11:03:10 +02:00
ogerly
ff559e71db merge #6045 #6267, resolve conflicts, fix save image 2023-05-17 11:01:49 +02:00
elweyn
a403ffd23c Merge branch '6266-Event-create-design-optimization' into 6267-eventteaser-design-optimization 2023-05-13 11:51:03 +02:00
elweyn
affd2e5dd8 Merge branch 'event-master' into 6266-Event-create-design-optimization 2023-05-13 11:50:34 +02:00
Hannes Heine
24ccdab47f
Merge branch 'master' into newsfeed-layout-fixes 2023-05-12 14:17:27 +02:00
Markus
f2256c8146 [webapp] added event infos to postteaser component 2023-05-10 14:12:07 +02:00
f4efe245a7
properly render avatars in group settings 2023-05-08 13:06:18 +02:00
Markus
013ec20e75 Merge branch 'master' into newsfeed-layout-fixes 2023-04-27 13:48:20 +02:00
Alexander Friedland
2426f5db88
Merge branch 'master' into 6266-Event-create-design-optimization 2023-04-27 08:41:41 +02:00