ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,983 Commits 117 Branches 1,511 Tags
Commit Graph

112 Commits

Author SHA1 Message Date
ogerly
584663686a delete LocationName in form 2022-09-29 14:30:23 +02:00
ogerly
e09fb1768f fix lint 2022-09-29 11:54:24 +02:00
ogerly
0a511b4ea2 form submit dissable by update 2022-09-29 11:53:51 +02:00
ogerly
992dd991c9 form error alternativ 2022-09-29 11:09:50 +02:00
Wolfgang Huß
f534d1cd40 Move component 'GroupContentMenu' to folder 'ContentMenu' 2022-09-28 16:42:22 +02:00
Wolfgang Huß
ac9be9e2a3 Refactor 'GroupContentMenu' component 2022-09-28 16:38:56 +02:00
ogerly
1199c5d77a fix lint 2022-09-28 15:21:40 +02:00
ogerly
f21796b5e2 delete location entry per button 2022-09-28 15:20:51 +02:00
ogerly
b965bab56b translation selects in GroupForm.vue, change css of selects 2022-09-28 14:36:35 +02:00
Wolfgang Huß
178c64a49d Merge branch '5344-add-group-members-management' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-implement-content-menu-group-profile 
# Conflicts:
#	webapp/components/Group/GroupContentMenu.vue
 2022-09-28 12:19:29 +02:00
Wolfgang Huß
3a51b6910d Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-implement-content-menu-group-profile 2022-09-28 12:05:34 +02:00
Wolfgang Huß
0d8ce0a172 Cleanup 2022-09-28 12:04:34 +02:00
Wolfgang Huß
1e01ccfa71 Add 'GroupContentMenu' on group profile page 2022-09-28 12:02:41 +02:00
ogerly
fdc72c71a4 resolve conflicts 2022-09-28 10:34:20 +02:00
ogerly
8ff171395c delete unused code 2022-09-28 10:17:29 +02:00
ogerly
6364974b71 add editor component for GroupForm.vue 2022-09-28 10:15:39 +02:00
Wolfgang Huß
bf60c41805 Overtake 'GroupContentMenu' from branch '5344-add-group-members-management' 2022-09-28 07:22:56 +02:00
ogerly
c2dc8b47a0 fix lint 2022-09-27 11:24:48 +02:00
ogerly
e430f22392 add test GroupContentMenu ans GroupForm 2022-09-27 11:24:02 +02:00
Wolfgang Huß
8ff8d55d6d Implement 'GroupButton' in 'default' layout 2022-09-26 21:43:13 +02:00
Wolfgang Huß
0d44d8ae04 Cleanup 
- Reduce tooltip delay to 750ms.
 2022-09-26 11:42:44 +02:00
Wolfgang Huß
7b11122bea Refine design and functionality of group list and create, edit group 2022-09-26 10:31:00 +02:00
Wolfgang Huß
41af877ab5 Refine functionality, second step 2022-09-25 13:22:07 +02:00
Wolfgang Huß
84d90ddb78 Refine design and a bit functionality, additions to first step 2022-09-24 18:13:55 +02:00
Wolfgang Huß
13ec4ee776 Refine design and a bit functionality, first step 2022-09-24 18:06:15 +02:00
Wolfgang Huß
2aa85d7b05 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5344-add-group-members-management 
# Conflicts:
#	backend/src/db/graphql/groups.js
#	backend/src/schema/resolvers/groups.js
#	webapp/components/Group/GroupCard.vue
#	webapp/components/Group/GroupForm.vue
#	webapp/components/Group/GroupTeaser.vue
#	webapp/graphql/groups.js
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/group/edit/_id.vue
 2022-09-23 15:04:49 +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
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
Wolfgang Huß
c2f7604918 Fix 'groupQuery' GQL on group edit page 
- Fix links 'group/my-groups' to 'my-groups'.
- Fix 'createGroupMutation' to be used as a function on group create page.
 2022-09-18 19:44:50 +02:00
Wolfgang Huß
e53e502587 Removed 'lang="ts"' in 'GroupCard.vue' 2022-09-18 18:51:43 +02:00
Wolfgang Huß
7f397b4669 Set Vue tooltip delay to 1500 ms and remove unneeded properties 2022-09-16 07:05:21 +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
ogerly
b57f5e253c add following event and emit 2022-09-14 11:25:43 +02:00
ogerly
f1957c5fe7 fix lint 2022-09-13 20:46:18 +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
ogerly
8f3a28ba53 add group button in menu, change text 2022-09-13 08:15:30 +02:00
ogerly
6d5f37a7b2 add success toaster if changeMemberRole 2022-09-12 13:19:14 +02:00