therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion

Browse source
This commit is contained in:
Roger Braun 2018-05-20 13:16:49 +02:00
commit 959b2d9d66
5 changed files with 72 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/user_settings/user_settings.vue
View file

@ -66,6 +66,13 @@
<p>{{$t('settings.follow_import_error')}}</p>
</div>
</div>
<div class="setting-item" v-if="enableFollowsExport">
<h3>{{$t('settings.follow_export')}}</h3>
<button class="btn btn-default" @click="exportFollows">{{$t('settings.follow_export_button')}}</button>
</div>
<div class="setting-item" v-else>
<h3>{{$t('settings.follow_export_processing')}}</h3>
</div>
<hr>
<div class="setting-item">
<h3>{{$t('settings.delete_account')}}</h3>