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
Wolfgang Huß
7687d6f28c Move 'setUnsetPostTypeFilter' to the store 2023-06-01 19:27:13 +02:00
Wolfgang Huß
52839f4b22 Move 'unsetAllPostTypeFilters' to the store 2023-06-01 19:07:07 +02:00
Wolfgang Huß
52c474536f Move all computed in file 'filterMenuMixin.js' to the store 2023-06-01 18:00:41 +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ß
d24200eabd
Update webapp/mixins/filterMenuMixin.js 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-06-01 17:11:55 +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
Wolfgang Huß
1a9c35cb11 Fix webapp tests 2023-06-01 16:26:38 +02:00
Ulf Gebhardt
4f3b3bb30b
fix frontend - babel loader cannot be to new 2023-06-01 13:46:20 +02:00
elweyn
726640a759 Create a function to switch between Article and Event. 2023-06-01 13:36:24 +02:00
elweyn
17e0d0a85c Rename creatEvent to createEvent 2023-06-01 13:04:06 +02:00
Ulf Gebhardt
fd961cb529
fixed lint problem 2023-06-01 12:03:56 +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
Ulf Gebhardt
540cd40e10
fixed coverage reporting 2023-06-01 11:47:21 +02:00
Hannes Heine
41cd147258
Merge branch 'master' into update-database 2023-05-31 21:26:39 +02:00
elweyn
ef7bb652bc Fix linting. 
Co-authored-by: maeckes-infinitylabs <markus@infinity.labs.ooo>
 2023-05-31 20:44:44 +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ß
152e18e650 Add separate filter buttons for articles and events 2023-05-31 15:06:52 +02:00
Wolfgang Huß
238c0ef605 Adjustment for filter button remove 'X' 2023-05-31 15:05:02 +02:00
elweyn
e18fa0cea0 Fix test of post edit. 
Co-authored-by: maeckes-infinitylabs<markus@infinity.labs.ooo>
 2023-05-31 12:32:48 +02:00
Wolfgang Huß
d178b63984 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6190-extend-newsfeed-filter-menu-for-events 2023-05-31 12:11:49 +02:00
Wolfgang Huß
a454ce51de Fix webapp tests 2023-05-31 12:10:00 +02:00
elweyn
1ca274fad4 Add creatEvent to the update post so the form has event specific fields. 
Co-authored-by: elweyn<heine.hannes@gmail.com>
Co-authored-by: maeckes-infinitylabs<markus@infinitylabs.ooo>
 2023-05-31 11:01:28 +02:00
Ulf Gebhardt
3bcd518bd4
reverted removal of data:null 2023-05-31 10:32:40 +02:00
Ulf Gebhardt
a21df08551
revered removal of data: null 2023-05-31 10:28:28 +02:00
Ulf Gebhardt
a50e3f2f14
Merge branch 'master' into typescript 2023-05-31 10:21:04 +02:00
Wolfgang Huß
4b4c3c91ff Implement order by start date for events 2023-05-30 17:08:23 +02:00
Ulf Gebhardt
3790f3d010
Merge pull request #6199 from Ocelot-Social-Community/event-master 
feat(other): 🍰 epic events – master
b2.6.0-422 		2023-05-30 16:28:29 +02:00
Hannes Heine
9a9f5eaf45
Merge branch 'master' into event-master 2023-05-30 15:26:22 +02:00
Ulf Gebhardt
a72ce57d12
Merge pull request #6260 from Ocelot-Social-Community/fix-avatar-seeding 
fix(other): fix avatar seeding
b2.6.0-421 		2023-05-30 14:05:50 +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ß
7d381a5fdb Fix typo in backend 'filter-posts.spec.js' 2023-05-30 12:11:16 +02:00
Wolfgang Huß
dba07a258e Revert "Stop auto closing by mouse leave of filter menu" 
This reverts commit 4050d8d01d0e6bbe9c72c3d5311d8c0692f34686.
 2023-05-30 11:53:28 +02:00
Wolfgang Huß
3e800751ed Beautify horizontal line above category buttons in filter menu 2023-05-30 11:47:34 +02:00
Wolfgang Huß
4050d8d01d Stop auto closing by mouse leave of filter menu 2023-05-30 11:46:00 +02:00
Wolfgang Huß
afbcb1244d Fix comment typing 2023-05-30 11:44:52 +02:00
Wolfgang Huß
0acc41dc73 Implement dev switch for stop automatic closing of filter menu 2023-05-30 11:44:23 +02:00
Wolfgang Huß
055e2f7a59 Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6190-extend-newsfeed-filter-menu-for-events 2023-05-30 10:54:57 +02:00
Wolfgang Huß
e090611efa Merge branch 'event-master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master 2023-05-30 10:53:53 +02:00
Wolfgang Huß
54c7f9e38d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into event-master 2023-05-30 10:53:20 +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
mahula
7b0322434a
Merge branch 'master' into fix-avatar-seeding 2023-05-30 10:11:29 +02:00
mahula
eecdb66024 refine interception assertion 2023-05-27 14:06:28 +02:00