mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
Merge branch 'master' into typescript
This commit is contained in:
commit
d2a44c8753
@ -9,7 +9,7 @@
|
||||
<p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
|
||||
<nuxt-link
|
||||
class="link"
|
||||
:to="{ name: isGroup ? 'group-id-slug' : 'post-id-slug', params, hashParam }"
|
||||
:to="{ name: isGroup ? 'group-id-slug' : 'post-id-slug', params, ...hashParam }"
|
||||
@click.native="$emit('read')"
|
||||
>
|
||||
<base-card wideContent>
|
||||
|
||||
@ -78,7 +78,7 @@ export default {
|
||||
Group: [],
|
||||
groupFilter: { isMember: true },
|
||||
tabActive: 'myGroups',
|
||||
pageSize: 5,
|
||||
pageSize: 6,
|
||||
activePage: 0,
|
||||
myGroupsCount: 0,
|
||||
allGroupsCount: 0,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user