Chapril/mobilizon.chapril.org-mobilizon
Chapril
/
mobilizon.chapril.org-mobilizon
24
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'fix-instance-cgu-selector' into 'master' 

Fix instance custom privacy policy not applying

See merge request framasoft/mobilizon!663
This commit is contained in:
Thomas Citharel 2020-10-27 17:58:15 +01:00
parent 53f6fb1c7e 0898d91cc3
commit 399c3ec945
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/views/Admin/Settings.vue
View File

@ -136,7 +136,7 @@
> >
<a <a
slot="default_terms" slot="default_terms"
href="https://mobilizon.org/terms" href="https://demo.mobilizon.org/terms"
target="_blank" target="_blank"
rel="noopener" rel="noopener"
>{{ $t("default Mobilizon terms") }}</a >{{ $t("default Mobilizon terms") }}</a
@ -167,7 +167,7 @@
> >
<a <a
slot="mobilizon_terms" slot="mobilizon_terms"
href="https://mobilizon.org/terms" href="https://demo.mobilizon.org/terms"
target="_blank" target="_blank"
rel="noopener" rel="noopener"
> >
@ -188,7 +188,7 @@
:label="$t('Instance Terms')" :label="$t('Instance Terms')"
v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM" v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM"
> >
<b-input type="textarea" v-model="adminSettings.instancePrivacyPolicy" /> <b-input type="textarea" v-model="adminSettings.instanceTerms" />
</b-field> </b-field>
<b-field :label="$t('Instance Privacy Policy Source')"> <b-field :label="$t('Instance Privacy Policy Source')">
<div class="columns"> <div class="columns">
@ -231,7 +231,7 @@
> >
<a <a
slot="default_privacy_policy" slot="default_privacy_policy"
href="https://mobilizon.fr/terms" href="https://demo.mobilizon.org/privacy"
target="_blank" target="_blank"
rel="noopener" rel="noopener"
>{{ $t("default Mobilizon privacy policy") }}</a >{{ $t("default Mobilizon privacy policy") }}</a
@ -259,7 +259,7 @@
> >
<a <a
slot="mobilizon_privacy_policy" slot="mobilizon_privacy_policy"
href="https://mobilizon.fr/privacy" href="https://demo.mobilizon.org/privacy"
target="_blank" target="_blank"
rel="noopener" rel="noopener"
> >