David Yip f8e934f955 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md		2018-03-12 17:52:19 -05:00
..
admin
concerns
form	Add option to show only local toots in timeline preview (#6292)	2018-02-04 06:00:10 +01:00
glitch
web
account.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
account_domain_block.rb
account_filter.rb
account_moderation_note.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
admin.rb
application_record.rb
backup.rb
block.rb	Cache relationships in API (#6482)	2018-02-18 03:14:46 +01:00
context.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
conversation.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
domain_block.rb
email_domain_block.rb
export.rb	Settings export refactor (#1646)	2017-04-13 13:02:02 +02:00
favourite.rb
feed.rb
follow.rb	Cache relationships in API (#6482)	2018-02-18 03:14:46 +01:00
follow_request.rb
glitch.rb	Move KeywordMute into Glitch namespace.	2017-10-21 14:54:36 -05:00
home_feed.rb
identity.rb	CAS + SAML authentication feature (#6425)	2018-02-04 05:42:13 +01:00
import.rb	Ensure the app does not even start if OTP_SECRET is not set (#6557)	2018-02-26 01:31:44 +01:00
instance.rb
instance_filter.rb
invite.rb	Change user_id column non-nullable (#6435)	2018-02-07 16:35:44 +01:00
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
media_attachment.rb
mention.rb
mute.rb
notification.rb
preview_card.rb	Fix avatar and header issues by using custom geometry detector (#6515)	2018-02-21 03:40:12 +01:00
remote_follow.rb	Using double splat operator (#5859)	2017-12-06 11:41:57 +01:00
remote_profile.rb	Introduce OStatus::TagManager (#5008)	2017-09-19 18:08:08 +02:00
report.rb
report_filter.rb
search.rb
session_activation.rb
setting.rb	Lists (#5703)	2017-11-18 00:16:48 +01:00
site_upload.rb
status.rb
status_pin.rb
stream_entry.rb
subscription.rb
tag.rb
user.rb
web.rb