IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,575 Commits 5 Branches 2 Tags
Commit Graph

5104 Commits

Author SHA1 Message Date
Ulf Gebhardt
33bb92de1a
Merge branch 'master' into fix-coverage 2023-06-07 10:56:46 +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
Moriz Wahl
abc2cc2241
Merge branch 'master' into alternate-solution-filter-order-post-types 2023-06-05 17:53:00 +02:00
mahula
8a10c95d62
Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-optimisation 2023-06-05 14:07:08 +02:00
elweyn
277e53ded5 Change ribbon text from 'post' to 'article' 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: entermex <max@infinity.labs.ooo>
 2023-06-05 13:03:46 +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
elweyn
1626b06948 Revert "refactor(webapp): changed locaalized text for article ribbon." 
This reverts commit 75f18e60d3d358b1586cac1ed021344d7c490ba5.
 2023-06-05 12:33:48 +02:00
Moriz Wahl
ddd60667a2
Merge branch 'master' into fix-webapp-unit-tests 2023-06-05 11:16:36 +02:00
Moriz Wahl
ff41c04cf9 test RESET_POST_TYPE 2023-06-02 19:08:45 +02:00
Moriz Wahl
72ef3fe6f2 clone filter for toggle events ended 2023-06-02 18:52:49 +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
0b4e309611 Merge branch 'master' into alternate-solution-filter-order-post-types 2023-06-02 18:13:58 +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
Moriz Wahl
ba80f14d8c refactor store and store tests 2023-06-02 16:55:01 +02:00
Hannes Heine
166941f860
Merge branch 'master' into 6340-refactor-webapp-event-teaser-ribbon-optimisation 2023-06-02 15:47:14 +02:00
Ulf Gebhardt
2c71293414
Merge branch 'master' into fix-coverage 2023-06-02 14:56:58 +02:00
Ulf Gebhardt
c8db4b2943
Merge branch 'master' into fix-coverage 2023-06-02 11:10:55 +02:00
Wolfgang Huß
779a23588a
Merge branch 'master' into 6330-node-version-upgrade-in-nvmrc-files-to-v20.2.0 2023-06-02 11:05:54 +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
entermex
9c98f87e69 refactor(webapp): changed color a bit litter for event-ribbons 2023-06-02 09:49:45 +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
75f18e60d3 refactor(webapp): changed locaalized text for article ribbon. 2023-06-02 00:17:29 +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
9176cbfe80
Merge branch 'master' into 6307-group-list-number-to-six 2023-06-01 22:50:46 +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ß
edfb667bcf Replace 'setEventsEnded' by 'toggleEventsEnded' 2023-06-01 19:29:58 +02:00
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
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