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

2667 Commits

Author SHA1 Message Date
Moriz Wahl
abc2cc2241
Merge branch 'master' into alternate-solution-filter-order-post-types 2023-06-05 17:53:00 +02:00
elweyn
b8b49e283b Move formSchema to computed & fix eventIsOnline 
Co-authored-by: ogerly <fridolin@tutanota.com>
 2023-06-05 17:44:47 +02:00
mahula
8a10c95d62
Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-optimisation 2023-06-05 14:07:08 +02:00
elweyn
93a679c17a 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-05 12:57:15 +02:00
Wolfgang Huß
71d964ae93
Merge branch 'master' into 6339-bug-webapp-event-update-page 2023-06-05 11:32:03 +02:00
Moriz Wahl
ddd60667a2
Merge branch 'master' into fix-webapp-unit-tests 2023-06-05 11:16:36 +02:00
Moriz Wahl
5ad7dac1fe use filterdPostTypes getter 2023-06-02 18:11:18 +02:00
Moriz Wahl
f252c76670 recover filteredPostTypes getter 2023-06-02 18:05:37 +02:00
Moriz Wahl
2ae6c350e1 get things working 2023-06-02 17:46:00 +02:00
Moriz Wahl
73f62212f8 refactor components for store changes 2023-06-02 16:55:52 +02:00
Ulf Gebhardt
c8db4b2943
Merge branch 'master' into fix-coverage 2023-06-02 11:10:55 +02:00
Wolfgang Huß
52798c1174 Refactor 'TOGGLE_EVENTS_ENDED' and 'eventsEnded' in store to contain the event start date 2023-06-02 11:04:28 +02:00
Wolfgang Huß
4f078e4b24 Fix webapp tests 2023-06-02 10:08:55 +02:00
Wolfgang Huß
51e1b496d4 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6190-extend-newsfeed-filter-menu-for-events 2023-06-02 09:27:28 +02:00
entermex
a08d4f48ae refactor(webapp): changed color for event-ribbon. 
Co-authored-by: Elweyn <heine.hannes@gmail.com>
 2023-06-01 23:42:09 +02:00
entermex
e11b4eb28e
Merge branch 'master' into 6290-fix-notification-menu-comment-hash 2023-06-01 22:19:44 +02:00
Wolfgang Huß
5863eed59a Delete file 'filterMenuMixin.js' and move all from there to the files where it's used 2023-06-01 20:42:51 +02:00
Wolfgang Huß
419ec5384f Move 'eventsEnded' and 'toggleEventsEnded' from file 'filterMenuMixin.js' to the files where it's used 2023-06-01 19:44:13 +02:00
Wolfgang Huß
c1d9766f39 Replace 'setOrder' by 'toggleOrder' 2023-06-01 19:31:21 +02:00
Wolfgang Huß
7687d6f28c Move 'setUnsetPostTypeFilter' to the store 2023-06-01 19:27:13 +02:00
Wolfgang Huß
9fee1b43c8 Fix typo of 'buttonLabel' 2023-06-01 17:18:24 +02:00
Wolfgang Huß
4eeaf7a793
Update webapp/components/FilterMenu/OrderByFilter.vue 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-06-01 17:12:31 +02:00
Wolfgang Huß
d0fe3006bc
Update webapp/components/FilterMenu/OrderByFilter.vue 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-06-01 17:11:05 +02:00
Wolfgang Huß
28e94b381f
Update webapp/components/FilterMenu/OrderByFilter.vue 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-06-01 17:10:24 +02:00
Wolfgang Huß
4fbdf70880 Change order of imports in 'FilterMenuComponent.vue' 2023-06-01 17:08:05 +02:00
Wolfgang Huß
8b0248057b Fix post type filter class name 2023-06-01 17:05:18 +02:00
elweyn
17e0d0a85c Rename creatEvent to createEvent 2023-06-01 13:04:06 +02:00
Ulf Gebhardt
773382d3ae
reverated wrong rename, reanmed proper file to .old 2023-06-01 12:03:03 +02:00
Ulf Gebhardt
e767024df8
renamed broken and unsed components & tests to .old to avoid them beeing tested 2023-06-01 11:50:48 +02:00
Wolfgang Huß
fab85aea78 Implement showing of only ended events on newsfeed 2023-05-31 18:31:27 +02:00
Moriz Wahl
39288b4cb5 fix(webapp): warnings in unit tests 2023-05-31 18:05:29 +02:00
Wolfgang Huß
238c0ef605 Adjustment for filter button remove 'X' 2023-05-31 15:05:02 +02:00
Wolfgang Huß
a454ce51de Fix webapp tests 2023-05-31 12:10:00 +02:00
Wolfgang Huß
4b4c3c91ff Implement order by start date for events 2023-05-30 17:08:23 +02:00
Wolfgang Huß
747cfb8c1d Rename post type filters computed in mixin 2023-05-30 13:03:38 +02:00
Wolfgang Huß
badc388da9 Implement mixin for filter menu 2023-05-30 12:37:38 +02:00
Wolfgang Huß
b08bacb7e0 Add title 'Creation date' to 'OrderByFilter.vue' 2023-05-30 12:36:49 +02:00
Wolfgang Huß
3e800751ed Beautify horizontal line above category buttons in filter menu 2023-05-30 11:47:34 +02:00
Wolfgang Huß
f2555fdbc4 Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6190-extend-newsfeed-filter-menu-for-events 2023-05-30 10:41:47 +02:00
Wolfgang Huß
133e584dec Add 'All' button to filter menu post type buttons 
- Unset post type filter menu button by clicking a set button.
 2023-05-26 19:40:14 +02:00
Wolfgang Huß
3fa8c3d2e3 Change behavior of filter menu post type buttons to switch between them by click 2023-05-26 19:22:55 +02:00
entermex
6807b6f543 Fix notification menu comment hash 2023-05-25 13:10:32 +02:00
Ulf Gebhardt
04ab8148f9
lint fixes 2023-05-25 12:41:04 +02:00
Ulf Gebhardt
2bd8a7ef04
make time selection to be always valid 2023-05-25 11:56:10 +02:00
Ulf Gebhardt
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