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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
This commit is contained in:
Thibaut Girka
2018-08-17 17:43:54 +02:00
parent 4a6bc2482a 59f7f4c923
commit 280d7b1df8
43 changed files with 353 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/settings/exports/show.html.haml
View File

@ -8,17 +8,25 @@
%th= t('exports.storage')
%td= number_to_human_size @export.total_storage
%td
%tr
%th= t('accounts.statuses')
%td= number_with_delimiter @export.total_statuses
%td
%tr
%th= t('exports.follows')
%td= number_to_human @export.total_follows
%td= number_with_delimiter @export.total_follows
%td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv)
%tr
%th= t('accounts.followers')
%td= number_with_delimiter @export.total_followers
%td
%tr
%th= t('exports.blocks')
%td= number_to_human @export.total_blocks
%td= number_with_delimiter @export.total_blocks
%td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
%tr
%th= t('exports.mutes')
%td= number_to_human @export.total_mutes
%td= number_with_delimiter @export.total_mutes
%td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv)
%p.muted-hint= t('exports.archive_takeout.hint_html')

11
app/views/settings/imports/show.html.haml
View File

@ -1,11 +1,14 @@
- content_for :page_title do
= t('settings.import')
%p.hint= t('imports.preface')
= simple_form_for @import, url: settings_import_path do |f|
= f.input :type, collection: Import.types.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
= f.input :data, wrapper: :with_label, hint: t('simple_form.hints.imports.data')
%p.hint= t('imports.preface')
.field-group
= f.input :type, collection: Import.types.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
.field-group
= f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data')
.actions
= f.button :button, t('imports.upload'), type: :submit