Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		2019-06-07 17:00:36 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
form	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
web
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
account_conversation.rb
account_domain_block.rb
account_filter.rb
account_identity_proof.rb
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
account_warning.rb
account_warning_preset.rb
admin.rb
application_record.rb
backup.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
block.rb
bookmark.rb	Thread scopes through #matches?. #454.	2018-06-03 23:00:50 -05:00
context.rb
conversation.rb
conversation_mute.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb
domain_block.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
email_domain_block.rb
export.rb
favourite.rb
featured_tag.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
list.rb
list_account.rb
list_feed.rb
media_attachment.rb	Added env variables for max image and video size.	2019-06-02 14:38:13 +02:00
mention.rb
mute.rb
notification.rb	Add account_id param to GET /api/v1/notifications (#10796)	2019-05-21 13:28:49 +02:00
poll.rb	Add support for custom emojis in poll options (#10322)	2019-03-20 17:29:12 +01:00
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb
remote_profile.rb
report.rb
report_filter.rb	Admin reports with accounts (#2092)	2017-04-18 19:36:18 +02:00
report_note.rb	Fix scope latest of ReportNote (#9630)	2018-12-26 06:38:59 +01:00
scheduled_status.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
setting.rb
site_upload.rb
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
status_pin.rb
status_stat.rb
stream_entry.rb
subscription.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
tag.rb
tombstone.rb
trending_tags.rb
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-26 15:41:40 +02:00
user_invite_request.rb	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
web.rb