tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gs-master

Browse Source
This commit is contained in:
David Yip
2017-10-27 09:45:25 -05:00
parent 656f5b6f87 781105293c
commit 870d71b78b
12 changed files with 88 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin/custom_emojis/_custom_emoji.html.haml
+6 -1
View File
@@ -9,7 +9,12 @@
- else
= custom_emoji.domain
%td
- unless custom_emoji.local?
- if custom_emoji.local?
- if custom_emoji.visible_in_picker
= table_link_to 'eye', t('admin.custom_emojis.listed'), admin_custom_emoji_path(custom_emoji, custom_emoji: { visible_in_picker: false }), method: :patch
- else
= table_link_to 'eye-slash', t('admin.custom_emojis.unlisted'), admin_custom_emoji_path(custom_emoji, custom_emoji: { visible_in_picker: true }), method: :patch
- else
= table_link_to 'copy', t('admin.custom_emojis.copy'), copy_admin_custom_emoji_path(custom_emoji, page: params[:page]), method: :post
%td
- if custom_emoji.disabled?