13356 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ulf Gebhardt	8c969c88bd	Merge pull request #6366 from Ocelot-Social-Community/fix-typescript-2 ... fix(other): typescript fix regarding dist/build folder 2	2023-06-02 16:22:41 +02:00
Ulf Gebhardt	57840fcc69	Merge branch 'master' into fix-typescript-2	2023-06-02 15:38:19 +02:00
Ulf Gebhardt	b6b1a62ffb	fix reference to dist folder when its build now	2023-06-02 15:34:35 +02:00
Ulf Gebhardt	cea248bdd9	Merge pull request #6365 from Ocelot-Social-Community/typescript-fix-build ... fix(backend): corrected path in branded images for backend build folder(former dist)	2023-06-02 13:57:20 +02:00
Ulf Gebhardt	1b484b1e3e	corrected path in braded images for backend build folder(former dist)	2023-06-02 12:40:02 +02:00
Wolfgang Huß	e004afc9c5	Merge pull request #6331 from Ocelot-Social-Community/6330-node-version-upgrade-in-nvmrc-files-to-v20.2.0 ... chore(other): upgrade node version in '.nvmrc' files to v20.2.0	2023-06-02 11:50:40 +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
Ulf Gebhardt	1b92bb60b3	Merge pull request #6321 from Ocelot-Social-Community/typescript ... feat(backend): typescript	2023-06-02 10:52:10 +02:00
Ulf Gebhardt	d2a44c8753	Merge branch 'master' into typescript	2023-06-02 10:16:01 +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	a4f84b0a4c	Merge pull request #6319 from Ocelot-Social-Community/6307-group-list-number-to-six ... fix(webapp): fix group list number to six	2023-06-01 23:29:06 +02:00
entermex	9176cbfe80	Merge branch 'master' into 6307-group-list-number-to-six	2023-06-01 22:50:46 +02:00
entermex	691226e3f3	Merge pull request #6335 from Ocelot-Social-Community/6290-fix-notification-menu-comment-hash ... fix(webapp): fix notification menu comment hash	2023-06-01 22:50:13 +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
Wolfgang Huß	fab85aea78	Implement showing of only ended events on newsfeed	2023-05-31 18:31:27 +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
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
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	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	2023-05-30 14:05:50 +02:00