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
mahula
5dd9c03b4f
Merge branch 'master' into seed-posts-as-articles 2023-06-07 09:32:01 +02:00
elweyn
2ac1d26947 Add free line to ContributionForm spec. 2023-06-07 09:26:51 +02:00
mahula
ec686bf298 Revert "update neode package" 
This reverts commit fafca69dbb86d494cf391a2653b5f2b229074573.
 2023-06-07 09:24:10 +02:00
mahula
000695aece update neode package 2023-06-07 09:23:35 +02:00
mahula
92eb498271 Revert "update neode package version globally" 
This reverts commit 6797c03a337f0cd7068275ebd5cf30cac43e9799.
 2023-06-07 09:22:29 +02:00
mahula
4dc322ff6d update neode package version globally 2023-06-07 09:21:35 +02:00
Moriz Wahl
70ad8abc4d fix(webapp): warnings in unit tests 2023-06-07 09:20:19 +02:00
elweyn
1b37e91ce2 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-07 09:20:19 +02:00
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
dcd5e5629b refactor(webapp): changed color a bit litter for event-ribbons 2023-06-07 09:15:47 +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
dependabot[bot]
439b3eac89 Bump metascraper-title from 5.33.5 to 5.34.7 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.33.5 to 5.34.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.33.5...v5.34.7)

---
updated-dependencies:
- dependency-name: metascraper-title
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-07 09:04:46 +02:00
dependabot[bot]
a7f3e201e5 Bump @babel/preset-env from 7.21.5 to 7.22.4 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.21.5 to 7.22.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.22.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-07 09:04:46 +02:00
Moriz Wahl
f2185dd60e test RESET_POST_TYPE 2023-06-07 09:03:18 +02:00
Moriz Wahl
739282e65b clone filter for toggle events ended 2023-06-07 09:03:18 +02:00
Moriz Wahl
374927121a watch posts filters, to ensure that hasMore is reset to true 2023-06-07 09:03:18 +02:00
Moriz Wahl
b84ee62b12 even closer to master 2023-06-07 09:03:18 +02:00
Moriz Wahl
29614df0c4 get closer to master 2023-06-07 09:03:18 +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
Moriz Wahl
2b4b7b2a40 refactor store and store tests 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ß
52e5d0a745 Replace 'setEventsEnded' by 'toggleEventsEnded' 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ß
61f406b3ee Move 'unsetAllPostTypeFilters' to the store 2023-06-07 09:03:18 +02:00
Wolfgang Huß
496b5cfba2 Move all computed in file 'filterMenuMixin.js' 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ß
c50e20b801 Update webapp/mixins/filterMenuMixin.js 
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ß
5f005b46ff Fix webapp tests 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ß
500298332f Add separate filter buttons for articles and events 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ß
b153619b9f Fix typo in backend 'filter-posts.spec.js' 2023-06-07 09:03:17 +02:00
Wolfgang Huß
e56d9496a5 Revert "Stop auto closing by mouse leave of filter menu" 
This reverts commit 4050d8d01d0e6bbe9c72c3d5311d8c0692f34686.
 2023-06-07 09:03:17 +02:00