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

Merge branch 'develop' into 'iss-149/profile-fields-setting'

Browse source 
# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
This commit is contained in:
Shpuld Shpludson 2020-06-27 07:19:49 +00:00
commit ea0a12f604
50 changed files with 570 additions and 286 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/settings_modal/tabs/profile_tab.vue
View file

@ -143,6 +143,11 @@
{{ $t("settings.profile_fields.add_field") }}
</a>
</div>
<p>
<Checkbox v-model="bot">
{{ $t('settings.bot') }}
</Checkbox>
</p>
<button
:disabled="newName && newName.length === 0"
class="btn btn-default"