Compare commits

...

2 Commits

Author SHA1 Message Date
2b6233c283 Merge branch 'chapril' of ssh://forge.april.org:222/Chapril/mobilizon.chapril.org-mobilizon into chapril 2021-06-02 21:26:46 +02:00
c82f8c5161 Merge tag '1.1.4' into chapril
19-05-2021

Fixes
-----

- Fixes rich media parsers, so that some resource links work again
- Fixes some depreciated calls that were removed in OTP24
- Fixes groups not being refreshed after joining a group
- Fixes the notice that is shown when joining a group that the content may not be available right away - because the group is remote - being shown everytime, even when the group is local
- Fixes OGP image not being defined for posts

Translations
------------

- French
- Galician
- Italian
2021-05-25 11:46:09 +02:00

View File

@ -7,8 +7,8 @@
<template slot="brand">
<b-navbar-item
tag="router-link"
:aria-label="$t('Home')"
:to="{ name: RouteName.HOME }"
:aria-label="$t('Home')"
>
<img
src="/img/long_logo_chapril_mobilizon.png"
@ -18,22 +18,6 @@
</b-navbar-item>
</template>
<template slot="start">
<<<<<<< HEAD
<b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }"
>{{ $t("Explore") }}
</b-navbar-item>
<b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }"
>{{ $t("My events") }}
</b-navbar-item>
<b-navbar-item
tag="router-link"
:to="{ name: RouteName.MY_GROUPS }"
v-if="config && config.features.groups"
>{{ $t("My groups") }}
</b-navbar-item>
<b-navbar-item tag="span" v-if="config && config.features.eventCreation">
=======
<b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
$t("Explore")
}}</b-navbar-item>
@ -63,7 +47,6 @@
currentUser.isLoggedIn
"
>
>>>>>>> 1.1.4
<b-button
tag="router-link"
:to="{ name: RouteName.CREATE_EVENT }"