potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
Conversation 0 Commits 80 Files changed 68 +157 -157
1 changed files with 157 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 02687e68bb - Show all commits

50
src/views/Group/GroupView.vue
View file

@ -373,31 +373,7 @@
</div>
</header>
</div>
<div v-if="group">
<div class="grid grid-cols-1 md:grid-cols-2 gap-2 mb-2">
<!-- Private thing: Group discussions -->
<Discussions
v-if="isCurrentActorAGroupMember && !previewPublic"
:group="discussionGroup ?? group"
/>
<!-- Private thing: Resources -->
<Resources
v-if="isCurrentActorAGroupMember && !previewPublic"
:group="resourcesGroup ?? group"
/>
<!-- Public thing: Events -->
<Events
:group="group"
:isModerator="isCurrentActorAGroupModerator && !previewPublic"
/>
<!-- Public thing: Posts -->
<Posts
:group="group"
:isModerator="isCurrentActorAGroupModerator && !previewPublic"
:isMember="isCurrentActorAGroupMember && !previewPublic"
/>
</div>
<div class="grid grid-cols-1 md:grid-cols-3 gap-2">
<div class="grid grid-cols-1 md:grid-cols-3 gap-2 mb-2">
<!-- Public thing: Members -->
<group-section :title="t('Members')" icon="account-group">
<template #default>
@ -544,6 +520,30 @@
</template>
</group-section>
</div>
<div v-if="group">
<div class="grid grid-cols-1 md:grid-cols-2 gap-2 mb-2">
<!-- Public thing: Events -->
<Events
:group="group"
:isModerator="isCurrentActorAGroupModerator && !previewPublic"
/>
<!-- Public thing: Posts -->
<Posts
:group="group"
:isModerator="isCurrentActorAGroupModerator && !previewPublic"
:isMember="isCurrentActorAGroupMember && !previewPublic"
/>
<!-- Private thing: Group discussions -->
<Discussions
v-if="isCurrentActorAGroupMember && !previewPublic"
:group="discussionGroup ?? group"
/>
<!-- Private thing: Resources -->
<Resources
v-if="isCurrentActorAGroupMember && !previewPublic"
:group="resourcesGroup ?? group"
/>
</div>
</div>
<div class="my-2">
<template v-if="isCurrentActorFollowing">