Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		2019-12-19 13:52:54 +01:00
..
admin	…
concerns	✨ Add an LDAP Mail attribute config (#12053)	2019-12-01 18:52:21 +01:00
form	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
account_alias.rb	…
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	…
account_identity_proof.rb	…
account_migration.rb	…
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	…
account_tag_stat.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	…
application_record.rb	…
backup.rb	Increase max backup size (#12602)	2019-12-17 13:30:58 +01:00
block.rb	…
bookmark.rb	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	…
direct_feed.rb	…
domain_allow.rb	…
domain_block.rb	…
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	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
marker.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-12 15:40:06 +01:00
mention.rb	…
mute.rb	…
notification.rb	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
poll.rb	Only normalize local polls (#12515)	2019-12-01 17:24:33 +01:00
poll_vote.rb	…
preview_card.rb	…
relay.rb	…
remote_follow.rb	…
report.rb	…
report_filter.rb	Add ability to filter reports by target account domain (#12154)	2019-11-30 19:53:58 +01:00
report_note.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
status_pin.rb	…
status_stat.rb	…
tag.rb	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	2019-12-17 13:31:56 +01:00
tag_filter.rb	…
tombstone.rb	…
trending_tags.rb	…
user.rb	Do not consider moved accounts as non-functional	2019-11-27 17:37:01 +01:00
user_invite_request.rb	…
web.rb	…