15341 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	e804ff52da	removed duplicate step defintion	2023-06-02 13:51:34 +02:00
Ulf Gebhardt	3ad8588d6f	fix .env loading	2023-06-02 13:44:43 +02:00
Ulf Gebhardt	810e1c085b	fix first errors	2023-06-02 13:15:06 +02:00
Ulf Gebhardt	ac087edcb8	include posttype in cypher query	2023-06-02 13:13:06 +02:00
Ulf Gebhardt	287827b3db	Merge branch 'master' into cypress-migrate-to-v10	2023-06-02 12:49:49 +02:00
Ulf Gebhardt	1b484b1e3e	corrected path in braded images for backend build folder(former dist)	2023-06-02 12:40:02 +02:00
Ulf Gebhardt	6aaa51e388	use sh instead of bash	2023-06-02 12:32:20 +02:00
Ulf Gebhardt	987e204ff9	remove all script functionality	2023-06-02 12:24:18 +02:00
Ulf Gebhardt	f4f016265a	capsulate in /bin/sh	2023-06-02 12:18:08 +02:00
Ulf Gebhardt	0954951e26	removed ./	2023-06-02 12:11:42 +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
Ulf Gebhardt	733a88bb26	try to fix result if promise resolves to null or invalid	2023-06-02 11:42:15 +02:00
Ulf Gebhardt	d08a78b685	Merge branch 'master' into seed-posts-as-articles	2023-06-02 11:12:56 +02:00
Ulf Gebhardt	c8db4b2943	Merge branch 'master' into fix-coverage	2023-06-02 11:10:55 +02:00
Ulf Gebhardt	031c9c370b	copy files in external script	2023-06-02 11:08:08 +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
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	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
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