1925 Commits

Author	SHA1	Message	Date
ogerly	beebcdbee7	Merge branch 'master' into 5344-add-group-members-management	2022-09-23 10:47:08 +02:00
ogerly	f1427b2528	fix lint	2022-09-23 10:45:38 +02:00
ogerly	3e1eb299b7	pull && resolve conflicts	2022-09-23 10:41:49 +02:00
ogerly	69620ca8d7	fix reviews	2022-09-23 10:38:21 +02:00
Alexander Friedland	fcf2bba1e8	Update webapp/components/Group/GroupList.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-23 09:06:25 +02:00
Alexander Friedland	c8dc0d99c0	Update webapp/components/Group/GroupForm.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-23 08:57:27 +02:00
Alexander Friedland	15981750a7	Update webapp/components/Group/GroupForm.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-23 08:32:34 +02:00
Alexander Friedland	10975f5551	Update webapp/components/Group/GroupForm.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-23 08:32:24 +02:00
Alexander Friedland	522a9ff4c1	Update webapp/components/Group/GroupForm.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-23 08:32:03 +02:00
Alexander Friedland	bf492ce9c3	Update webapp/components/Group/GroupForm.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-23 08:31:46 +02:00
Alexander Friedland	c37aef89bc	Update webapp/components/Group/GroupForm.vue ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-09-23 08:31:36 +02:00
ogerly	858739eaa0	fix review	2022-09-22 18:42:58 +02:00
ogerly	1af5ce9e30	add [200~.ds-footer a {scss token	2022-09-22 18:20:13 +02:00
ogerly	4045260fc3	remove console log, fix lint	2022-09-22 17:55:17 +02:00
ogerly	5f5c0faa1f	cleanup refactor rebranding	2022-09-22 17:52:03 +02:00
ogerly	0293fec7e7	step1 refactor rebranding	2022-09-22 16:51:48 +02:00
ogerly	58e48cfe77	rebrand in config for scss and styleguide	2022-09-21 12:09:35 +02:00
ogerly	1fdee4058d	fix yarn	2022-09-20 16:51:33 +02:00
ogerly	5974ff7c24	change footer links	2022-09-20 16:50:34 +02:00
ogerly	a1292ef9ff	fix lint	2022-09-20 16:03:50 +02:00
ogerly	52070b8c57	change color and scss in branding	2022-09-20 16:03:06 +02:00
ogerly	bfcfb8462e	resolve conflict	2022-09-20 10:29:37 +02:00
Alexander Friedland	e4c3600ad6	Merge branch '5059-epic-groups' into 5344-add-group-members-management	2022-09-19 18:55:44 +02:00
ogerly	57a6e74d10	fix lint and locales	2022-09-19 18:50:53 +02:00
ogerly	7d5205e08b	translation of the texts	2022-09-19 18:27:41 +02:00
ogerly	a5e0794ec8	style in groupList for locationName and radius	2022-09-15 13:13:51 +02:00
ogerly	bc8cba13b3	add location and location name for group	2022-09-15 12:38:59 +02:00
Moriz Wahl	64153ea9e3	change delay of category tooltip to 1500	2022-09-15 10:04:26 +02:00
Wolfgang Huß	6af9e0cec0	Merge branch '5059-groups/5318-group-profile-second' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-members-list-etc ... # Conflicts: # webapp/locales/de.json # webapp/locales/en.json	2022-09-14 16:18:37 +02:00
Wolfgang Huß	2d3d559eab	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups	2022-09-14 14:28:09 +02:00
Wolfgang Huß	ff8f3fed7a	Implement confirm modal for leaving a group	2022-09-14 14:12:06 +02:00
Wolfgang Huß	13727729a5	Refactor join/leave button function and the related events	2022-09-14 13:01:07 +02:00
ogerly	b57f5e253c	add following event and emit	2022-09-14 11:25:43 +02:00
Wolfgang Huß	bfef47a2a1	fix assignment to prop in 'JoinLeaveButton'	2022-09-14 08:28:56 +02:00
ogerly	f1957c5fe7	fix lint	2022-09-13 20:46:18 +02:00
Wolfgang Huß	0cd3617f65	Implement working leave button on group profile	2022-09-13 20:42:08 +02:00
ogerly	41955c5f56	add gruopMenu	2022-09-13 20:40:40 +02:00
ogerly	70b32b9363	add disable submit button on formData new and update	2022-09-13 15:06:47 +02:00
ogerly	ab2d7ad87d	style first step one	2022-09-13 09:56:03 +02:00
Moriz Wahl	5727eeb49f	feature: Tooltips for Topics	2022-09-13 09:17:04 +02:00
ogerly	8f3a28ba53	add group button in menu, change text	2022-09-13 08:15:30 +02:00
Wolfgang Huß	330bdd4df5	Implement join/leave button on group profile	2022-09-12 20:00:48 +02:00
Wolfgang Huß	aac951e7a7	Refine profile and follow list	2022-09-12 13:23:37 +02:00
ogerly	6d5f37a7b2	add success toaster if changeMemberRole	2022-09-12 13:19:14 +02:00
ogerly	a2561bde89	member management first step	2022-09-12 13:16:55 +02:00
Wolfgang Huß	8e1355e5ee	Change 'titleNobody' in component 'ProfileList' to not(!) required	2022-09-12 09:42:03 +02:00
Wolfgang Huß	9e544b0e64	Rename props and classes in 'ProfileList'	2022-09-12 08:35:52 +02:00
Wolfgang Huß	b7be7018e8	Move important parts of 'FollowList' to sub component 'ProfileList'	2022-09-12 08:26:10 +02:00
Wolfgang Huß	a9376cb979	Renamed folder 'FollowList' to 'ProfileList'	2022-09-12 07:32:18 +02:00
Wolfgang Huß	1796a04a9c	Update webapp/components/Group/GroupForm.vue	2022-09-10 08:57:06 +02:00