kibigo! 79d898ae0a Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00

..

concerns

Fix #2848 - Rake task to redownload avatars/headers (#4156)

2017-07-11 17:25:49 +02:00

form

Improve UI of admin site settings (#4163)

2017-07-12 03:24:04 +02:00

web

…

account_domain_block.rb

…

account_filter.rb

…

account.rb

don't count bio metadata against bio length on server

2017-06-26 09:34:31 -05:00

application_record.rb

…

block.rb

…

context.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

conversation_mute.rb

…

conversation.rb

…

domain_block.rb

…

export.rb

…

favourite.rb

…

feed.rb

Remove sort in Feed (#4050)

2017-07-03 13:17:27 +02:00

follow_request.rb

…

follow.rb

…

import.rb

…

instance.rb

…

media_attachment.rb

Explicitly require MIME::Types (#4083)

2017-07-05 23:58:03 +02:00

mention.rb

…

mute.rb

…

notification.rb

…

preview_card.rb

…

remote_follow.rb

…

remote_profile.rb

…

report_filter.rb

…

report.rb

…

search.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

session_activation.rb

Do not fail to create access token if superapp was never created (#3986)

2017-06-28 17:43:48 +02:00

setting.rb

…

status.rb

Fix regression from #3842 (#3892)

2017-06-22 02:38:50 +02:00

stream_entry.rb

…

subscription.rb

…

tag.rb

…

user.rb

Add setting a always mark media as sensitive (#4136)

2017-07-10 14:00:32 +02:00

web.rb

…