Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml		2018-08-01 22:20:25 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
form	Add separate setting for sidebar text (site_short_description) (#8107)	2018-07-31 18:59:34 +02:00
web
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
account_domain_block.rb
account_filter.rb
account_moderation_note.rb
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
conversation.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	2018-07-09 02:22:09 +02:00
domain_block.rb
email_domain_block.rb
export.rb
favourite.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
invite_filter.rb	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
list.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
list_account.rb
list_feed.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
preview_card.rb
relay.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
remote_follow.rb
remote_profile.rb
report.rb
report_filter.rb
report_note.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
status_pin.rb
stream_entry.rb
subscription.rb
tag.rb	Track trending tags (#7638)	2018-05-27 21:45:30 +02:00
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-06-21 20:49:57 +02:00
web.rb