IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,529 Commits 5 Branches 2 Tags
Commit Graph

1112 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
22f5c90a21
Update webapp/pages/group/edit/_id/members.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 09:00:07 +02:00
Alexander Friedland
4c55ca731e
Update webapp/pages/my-groups.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-23 08:59:45 +02:00
ogerly
52070b8c57 change color and scss in branding 2022-09-20 16:03:06 +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ß
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
Wolfgang Huß
176fb3919a Fix Vue HTML errors in group profile 'groupType' etc. 2022-09-14 08:49:45 +02:00
Wolfgang Huß
9472a68bcd Add Vue 'head' element to group and user profile 2022-09-13 22:49:46 +02:00
Wolfgang Huß
e04bfe7484 Implement displaying of 'myRole', 'groupType', and 'actionRadius' on group profile 2022-09-13 22:06:16 +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
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ß
13e7b1fb9c Simplify assignment to 'Group[0]' after refining things 2022-09-13 06:03:50 +02:00
Wolfgang Huß
4e845284fc Fix error that the prop 'groupId' in 'JoinLeaveButton' is undefined at the beginning 2022-09-12 20:08:04 +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
Wolfgang Huß
6f1c718d39 Fix 'uniqueName' at group members list on group profile 2022-09-12 13:20:36 +02:00
ogerly
a2561bde89 member management first step 2022-09-12 13:16:55 +02:00
Wolfgang Huß
c6b9cfac67 Implement group members count on group profile 
- Rename 'Hc*' components to '*'.
 2022-09-12 11:56:00 +02:00
Wolfgang Huß
621b1a0ba0 Implement members list on group profile 2022-09-12 09:44:23 +02:00
Wolfgang Huß
a9376cb979 Renamed folder 'FollowList' to 'ProfileList' 2022-09-12 07:32:18 +02:00
ogerly
26cf8f14d9 resolve conflicts 2022-09-09 13:18:46 +02:00
ogerly
a1da04ec05 change components add constants 2022-09-09 13:06:13 +02:00
Alexander Friedland
7cb965e9ad
Update webapp/pages/group/edit/_id.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-09 13:04:26 +02:00
Alexander Friedland
62f57681eb
Update webapp/pages/group/edit/_id.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-09 13:04:15 +02:00
ogerly
a5d5dd7eda import GroupMembers component in group settings 2022-09-09 12:23:51 +02:00
Alexander Friedland
07b3857e4b
Update webapp/pages/group/edit/_id/index.vue 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-09-09 12:18:57 +02:00
ogerly
3d5f29c0f1 change page structure for groupe settings 2022-09-09 12:17:48 +02:00
ogerly
109a5f5aa4 fix lint 2022-09-09 11:11:15 +02:00
ogerly
362aae3c5b add router in group settings 2022-09-09 11:10:11 +02:00
ogerly
46f981357f fix lint 2022-09-09 10:19:24 +02:00
ogerly
e5a969b3f7 group settings add sidemenu 2022-09-08 17:05:16 +02:00
ogerly
f6de01e821 resolve conflicts 2022-09-08 12:11:50 +02:00
ogerly
fb9cf7559e fix updateGroup function 2022-09-08 11:59:54 +02:00
ogerly
fe6ad2cff3 add better seed for group myRole 2022-09-08 09:55:58 +02:00
ogerly
99d2ce9d29 update group data funktion 2022-09-08 08:35:29 +02:00
Wolfgang Huß
99b1a164a8 Remove testing of group profile for now 2022-09-07 12:29:17 +02:00