Thibaut Girka 055450bc02 Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 23:37:41 +02:00

..

admin

Fix option to send e-mail notification about account action always being true (#11242)

2019-07-06 13:54:32 +02:00

concerns

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

form

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

web

…

account_conversation.rb

…

account_domain_block.rb

…

account_filter.rb

Add moderation API (#9387)

2019-06-20 02:52:34 +02:00

account_identity_proof.rb

Fix Keybase verification using wrong domain for remote accounts (#10547)

2019-04-10 20:28:43 +02:00

account_moderation_note.rb

…

account_pin.rb

…

account_stat.rb

…

account_tag_stat.rb

…

account_warning_preset.rb

…

account_warning.rb

…

account.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

admin.rb

…

application_record.rb

…

backup.rb

…

block.rb

…

bookmark.rb

…

context.rb

…

conversation_mute.rb

…

conversation.rb

…

custom_emoji_category.rb

Add categories for custom emojis (#11196)

2019-06-28 15:54:10 +02:00

custom_emoji_filter.rb

…

custom_emoji.rb

Add categories for custom emojis (#11196)

2019-06-28 15:54:10 +02:00

custom_filter.rb

Fix expiration date of filters being set to “Never” when editing them (#11204)

2019-06-30 16:11:21 +02:00

direct_feed.rb

Use a redis-cached feed for the DM timeline

2019-06-27 16:44:12 +02:00

domain_block.rb

Change domain blocks to automatically support subdomains (#11138)

2019-06-22 00:13:10 +02:00

email_domain_block.rb

…

export.rb

…

favourite.rb

…

featured_tag.rb

…

feed.rb

…

follow_request.rb

…

follow.rb

…

home_feed.rb

…

identity.rb

…

import.rb

…

instance_filter.rb

…

instance.rb

Remove expensive counters from federation page in admin UI (#11139)

2019-06-22 00:39:09 +02:00

invite_filter.rb

…

invite.rb

…

list_account.rb

…

list_feed.rb

…

list.rb

…

media_attachment.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +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_vote.rb

…

poll.rb

…

preview_card.rb

…

relay.rb

…

remote_follow.rb

…

report_filter.rb

Add moderation API (#9387)

2019-06-20 02:52:34 +02:00

report_note.rb

…

report.rb

Add moderation API (#9387)

2019-06-20 02:52:34 +02:00

scheduled_status.rb

…

search.rb

…

session_activation.rb

…

setting.rb

…

site_upload.rb

…

status_pin.rb

…

status_stat.rb

…

status.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

subscription.rb

…

tag.rb

Disallow numeric-only hashtags (#11363)

2019-07-19 23:22:35 +02:00

tombstone.rb

Record deleted(by mod) status to prevent re-appear (#10732)

2019-05-09 22:03:02 +02:00

trending_tags.rb

…

user_invite_request.rb

Add "why do you want to join" field to invite requests (#10524)

2019-04-09 23:06:30 +09:00

user.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 18:26:49 +02:00

web.rb

…