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

1511 Commits

Author SHA1 Message Date
elweyn
9715df70f8 Merge @maeckes PR in @elweyn PR. 
Co-authored-by: maeckes <markus@infinity.labs.ooo>
 2023-06-07 09:35:54 +02:00
elweyn
bb7721b670 Fix linting! 2023-06-06 14:35:57 +02:00
elweyn
ab579e521b Change side menu text of Post. 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2023-06-06 11:24:52 +02:00
elweyn
ad0ccf59e6 Merge branch '6339-bug-webapp-event-update-page' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 6339-bug-webapp-event-update-page 2023-06-06 11:14:24 +02:00
elweyn
6accd65ee1 Add methods for Start/End Date-/Time-String 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2023-06-06 11:13:57 +02:00
Hannes Heine
3cd55051f7
Merge branch 'master' into 6339-bug-webapp-event-update-page 2023-06-05 21:20:34 +02:00
Ulf Gebhardt
514a5c4894
fix warning in edit post test 2023-06-05 20:53:03 +02:00
Ulf Gebhardt
f894cca63d
fix test warning 2023-06-05 20:46:43 +02:00
elweyn
a24e2186be Fix linting 2023-06-05 17:55:45 +02:00
elweyn
734891e93d Fix localization of edit events 
Co-authored-by: ogerly <fridolin@tutanota.com>
 2023-06-05 17:54:37 +02:00
Moriz Wahl
abc2cc2241
Merge branch 'master' into alternate-solution-filter-order-post-types 2023-06-05 17:53:00 +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
d3a694e6e7 watch posts filters, to ensure that hasMore is reset to true 2023-06-02 18:45:02 +02:00
Moriz Wahl
5389b607db even closer to master 2023-06-02 18:27:23 +02:00
Moriz Wahl
fdf4eb6bdc get closer to master 2023-06-02 18:25:13 +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
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
9176cbfe80
Merge branch 'master' into 6307-group-list-number-to-six 2023-06-01 22:50:46 +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ß
52839f4b22 Move 'unsetAllPostTypeFilters' to the store 2023-06-01 19:07:07 +02:00
Wolfgang Huß
1a9c35cb11 Fix webapp tests 2023-06-01 16:26:38 +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
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
elweyn
e18fa0cea0 Fix test of post edit. 
Co-authored-by: maeckes-infinitylabs<markus@infinity.labs.ooo>
 2023-05-31 12:32:48 +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
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ß
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
Ulf Gebhardt
04ab8148f9
lint fixes 2023-05-25 12:41:04 +02:00
Ulf Gebhardt
3f1e42e6fd
externalize styles 2023-05-25 12:15:03 +02:00
entermex
bb3047a21a
Merge branch 'master' into 6307-group-list-number-to-six 2023-05-25 11:23:53 +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
12a4ab6b83 merged master and resolved conflict in webapp/pages/index.vue 2023-05-24 10:16:07 +02:00
Moriz Wahl
60b05379d9 post page test fixed 2023-05-23 11:29:18 +02:00
entermex
f3ea0ea6ef Fix group list number to six 2023-05-19 12:41:39 +02:00
Markus
7c37d9f9ef added conditional check for event time, code syntaxes 2023-05-17 15:32:49 +02:00
ogerly
ff559e71db merge #6045 #6267, resolve conflicts, fix save image 2023-05-17 11:01:49 +02:00
ogerly
b4275f44cb Merge branch '6045-add-event-info-to-post' into event-master 2023-05-17 10:11:39 +02:00
ogerly
b421202e59 resolve conflict 2023-05-17 09:22:15 +02:00