Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
form	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
web
account_domain_block.rb
account_filter.rb
account_moderation_note.rb
account_pin.rb	Add API endpoint to list featured accounts (fixes #8315) (#8317)	2018-08-20 18:46:04 +02:00
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb
conversation_mute.rb
conversation.rb
custom_emoji_filter.rb
custom_emoji.rb
custom_filter.rb
domain_block.rb
email_domain_block.rb
export.rb	Show exact number of followers/statuses on export page/in tooltip (#8199)	2018-08-14 21:56:17 +02:00
favourite.rb	Fix error when trying to update counters for statuses that are gone (#8251)	2018-08-18 03:03:23 +02:00
feed.rb
follow_request.rb
follow.rb	Implement Undo { Accept { Follow } } (fixes #8234) (#8245)	2018-08-17 16:24:56 +02:00
home_feed.rb
identity.rb
import.rb
instance_filter.rb
instance.rb
invite_filter.rb
invite.rb
list_account.rb
list_feed.rb
list.rb
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
mention.rb
mute.rb
notification.rb	Remove annoying Notification#cache_ids scope warning (#8333)	2018-08-21 02:49:51 +02:00
preview_card.rb
relay.rb	Expect relays to answer with accept/reject (#8179)	2018-08-13 18:17:20 +02:00
remote_follow.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
remote_profile.rb
report_filter.rb
report_note.rb
report.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status_pin.rb
status_stat.rb	Move status counters to separate table, count replies (#8104)	2018-08-14 19:19:32 +02:00
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00
stream_entry.rb
subscription.rb
tag.rb
trending_tags.rb	Fix number of results returned from TrendingTags.get	2018-07-16 19:54:14 +02:00
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
web.rb