Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
admin	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
form	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
web	Do no retry web push workers if the server returns a 4xx response (#9434)	2018-12-17 03:14:13 +01:00
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	Redesign admin accounts index (#9340)	2018-11-26 15:53:27 +01:00
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
account_tag_stat.rb	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
account_warning.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
account_warning_preset.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	Make custom emoji domains case insensitive #9351 (#9474)	2018-12-11 05:30:57 +01:00
custom_emoji_filter.rb	Make custom emoji domains case insensitive #9351 (#9474)	2018-12-11 05:30:57 +01:00
custom_filter.rb	…
domain_block.rb	Create DomainNormalizable#normalize_domain (#9631)	2018-12-26 06:38:42 +01:00
email_domain_block.rb	Create DomainNormalizable#normalize_domain (#9631)	2018-12-26 06:38:42 +01:00
export.rb	Add CSV export for lists and domain blocks (#9677)	2019-01-01 13:44:04 +01:00
favourite.rb	…
feed.rb	…
follow.rb	…
follow_request.rb	…
home_feed.rb	…
identity.rb	Change identities id column to a bigint (#9371)	2018-11-27 13:56:25 +01:00
import.rb	…
instance.rb	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
instance_filter.rb	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
invite.rb	…
invite_filter.rb	…
list.rb	Add database support for list show-reply preferences	2018-11-28 14:46:07 +01:00
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
mention.rb	…
mute.rb	…
notification.rb	…
preview_card.rb	…
relay.rb	Use Contact User as Relay, Report, Subscribe. (#9661)	2019-01-05 07:17:12 +01:00
remote_follow.rb	…
remote_profile.rb	…
report.rb	…
report_filter.rb	…
report_note.rb	Fix scope latest of ReportNote (#9630)	2018-12-26 06:38:59 +01:00
scheduled_status.rb	Fix deleting a scheduled status immediately deleting media attachments (#9728)	2019-01-06 16:38:40 +01:00
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
status_pin.rb	…
status_stat.rb	…
stream_entry.rb	…
subscription.rb	…
tag.rb	Cache hashtag sample accounts, and exclude ineligible ones (#9465)	2018-12-08 01:32:26 +01:00
trending_tags.rb	…
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
web.rb	…