11879 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	73d2e4af29	backend: jest coverage report	2022-11-07 18:34:02 +01:00
Ulf Gebhardt	a5200893f4	reverted all package updates	2022-11-07 18:33:47 +01:00
Ulf Gebhardt	f57e11dd02	frontend: jest coverage	2022-11-07 18:23:54 +01:00
Wolfgang Huß	4cd8c58f53	Merge pull request #5610 from Ocelot-Social-Community/5609-release-v2.2.0 ... chore: 🍰 Release v2.2.0 b2.2.0-267 2.2.0	2022-10-28 16:52:04 +02:00
Wolfgang Huß	82ad94f5da	Release v2.2.0	2022-10-28 16:03:01 +02:00
Wolfgang Huß	9a17ac12f1	Merge pull request #5597 from Ocelot-Social-Community/5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu ... refactor: 🍰 Refactor Design Of Category Filter In Filter Menu b2.1.0-266	2022-10-28 15:37:42 +02:00
ogerly	d2f431d58c	coverage from 64 to 63	2022-10-28 15:04:16 +02:00
ogerly	52dcd772fa	comment out LanguagesFilter, EmotionsFilter, fix tests, fix lint	2022-10-28 14:24:57 +02:00
ogerly	e7fe6a9d3d	Merge remote-tracking branch 'origin/master' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu	2022-10-28 13:46:38 +02:00
Wolfgang Huß	7f26c0184a	Merge pull request #5590 from Ocelot-Social-Community/5545-Footer-And-Header-Links-Configurable ... feat: 🍰 Footer And Header Links Configurable To Have External Link Target b2.1.0-265	2022-10-28 13:46:02 +02:00
Wolfgang Huß	30dd5ec546	Merge pull request #5546 from Ocelot-Social-Community/Make-Header-Menu-To-Component ... feat: 🍰 Header Menu To Component And Other Refinements b2.1.0-264	2022-10-28 13:45:45 +02:00
ogerly	bf87033b33	Merge remote-tracking branch 'origin/master' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu	2022-10-28 13:44:47 +02:00
Moriz Wahl	d5d0402205	Merge pull request #5607 from Ocelot-Social-Community/webapp-comments-on-groups ... fix: 🍰 Comments On Posts In Groups In Webapp b2.1.0-263	2022-10-28 13:44:09 +02:00
ogerly	128a98cc27	unused slot sidebar in filter menu, an d style	2022-10-28 13:39:16 +02:00
ogerly	2532dae733	fix lint	2022-10-28 13:16:20 +02:00
Wolfgang Huß	f7cc020feb	Fix linting	2022-10-28 13:15:44 +02:00
ogerly	c0bab3cd50	fix test	2022-10-28 13:15:44 +02:00
Wolfgang Huß	48d6bf6bd1	Remove commented 'deleteMember'	2022-10-28 13:14:55 +02:00
Wolfgang Huß	65431c2baf	Merge branch '5545-Footer-And-Header-Links-Configurable' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable ... # Conflicts: # webapp/components/Group/GroupMember.vue	2022-10-28 13:13:53 +02:00
Wolfgang Huß	27589a64ba	Fix target property in 'HeaderMenu.vue'	2022-10-28 13:08:39 +02:00
Wolfgang Huß	ed48656d8a	Revert to have header menu groups button again	2022-10-28 12:48:58 +02:00
Wolfgang Huß	b20b797d60	Fix target property in 'PageParamsLink.vue'	2022-10-28 12:48:27 +02:00
ogerly	9b7dc2cac7	fix lint	2022-10-28 12:27:04 +02:00
Wolfgang Huß	ffb508806b	Disable remove group member button, because this doesn't work yet	2022-10-28 12:10:57 +02:00
Wolfgang Huß	b45545decf	Adjust 'internalPageMixins'	2022-10-28 12:06:16 +02:00
Wolfgang Huß	f5f3fbeadb	Fix linting	2022-10-28 12:05:45 +02:00
ogerly	8c1c260418	menu filter clear position of buttons	2022-10-28 12:05:23 +02:00
Wolfgang Huß	00c10cc1a7	Refine footer links and donation link and fix their tests	2022-10-28 11:50:15 +02:00
Moriz Wahl	847775a3f4	fix: Comments on Posts in Groups in Webapp	2022-10-28 11:00:27 +02:00
Wolfgang Huß	9bf0e26731	Merge branch 'Make-Header-Menu-To-Component' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable	2022-10-28 10:13:52 +02:00
Wolfgang Huß	6d3c7f0acb	Simplify usage of 'LOGOS.LOGO_HEADER_CLICK.externalLink.target'	2022-10-28 10:12:39 +02:00
Wolfgang Huß	6c45b1f3a1	Merge branch 'Make-Header-Menu-To-Component' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable	2022-10-28 09:14:08 +02:00
Wolfgang Huß	ef97b4c388	Fix a merging left over with header logo click and fix functionallity on empty string targets	2022-10-28 09:11:01 +02:00
ogerly	709c9b1073	fix lint	2022-10-28 08:48:29 +02:00
ogerly	0c9fcaa5c6	test coverage to 64%	2022-10-28 08:47:55 +02:00
Wolfgang Huß	c30d27bd6c	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into Make-Header-Menu-To-Component	2022-10-28 08:09:26 +02:00
Wolfgang Huß	f6c98475b3	Merge pull request #5600 from Ocelot-Social-Community/5064-add-live-demo-do-main-readme ... docs: 🍰 Add Live Demo To Main Readme b2.1.0-262	2022-10-27 21:25:39 +02:00
Moriz Wahl	5efb530d42	Merge pull request #5599 from Ocelot-Social-Community/comments-on-posts-in-groups ... feat: Restrict Comments on Posts in Groups b2.1.0-261	2022-10-27 20:43:55 +02:00
Alexander Friedland	e55917c7c6	Merge pull request #5591 from Ocelot-Social-Community/4744-Missing-Space-On-Registration-Slider ... fix: 🍰 Add Space In Register Box b2.1.0-260	2022-10-27 18:36:16 +02:00
Wolfgang Huß	09cb120f92	Add 'ds-spaces' to the other registration slider components	2022-10-27 16:03:13 +02:00
ogerly	533eef0f37	remove unused code	2022-10-27 15:46:41 +02:00
ogerly	75ff8f5eba	fix lint	2022-10-27 15:30:06 +02:00
ogerly	20ca2eca39	change style for button position	2022-10-27 15:29:21 +02:00
ogerly	93add91e77	fix lint	2022-10-27 15:23:19 +02:00
ogerly	76ad2ec063	change <space-xx-small /> to <ds-space margin=xxx-small />	2022-10-27 15:22:22 +02:00
ogerly	4c4e67bcf7	filter category save and all button in on line	2022-10-27 15:17:27 +02:00
Moriz Wahl	831cb20952	Merge pull request #5583 from Ocelot-Social-Community/update-group-avatar-on-upload ... fix: 🍰 Update Group Avatar After Upload b2.1.0-259	2022-10-27 14:51:33 +02:00
Wolfgang Huß	134a8099c8	Add live demo to main readme	2022-10-27 14:35:41 +02:00
ogerly	d0e298ad26	Merge branch 'Make-Header-Menu-To-Component' into 5540-Refactor-Design-Of-Category-Filter-In-Filter-Menu	2022-10-27 14:21:21 +02:00
Wolfgang Huß	18e9d5488a	Merge pull request #5593 from Ocelot-Social-Community/5580-make-donation-bar-configurable ... feat: 🍰 Make Donation Progress Bar Color Configurable b2.1.0-258	2022-10-27 14:14:25 +02:00