mastodon/app/models
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01:00
..
admin Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289) 2020-03-21 03:08:09 +01:00
concerns Change local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +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 2020-03-22 16:10:44 +01:00
account_alias.rb
account_conversation.rb
account_domain_block.rb
account_filter.rb Add sorting by username, creation and last activity in moderation view (#13076) 2020-03-08 15:39:13 +01:00
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 Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
admin.rb
announcement.rb Add support for links to statuses in announcements to be opened in web UI (#13212) 2020-03-08 16:10:48 +01:00
announcement_filter.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
announcement_mute.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
announcement_reaction.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
application_record.rb
backup.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
block.rb
bookmark.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
custom_emoji_category.rb
custom_emoji_filter.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
custom_filter.rb Add “account timeline” filter category (#12918) 2020-01-23 21:32:00 +01:00
direct_feed.rb
domain_allow.rb
domain_block.rb Allow blocking TLDs, and fix TLD blocks not being editable (#12805) 2020-01-08 22:42:05 +01:00
email_domain_block.rb Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254) 2020-03-12 22:35:20 +01:00
export.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
follow_request.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
invite.rb
invite_filter.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
list.rb
list_account.rb
list_feed.rb
marker.rb
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +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
relationship_filter.rb Fix relationships page not showing results in admin UI (#12934) 2020-01-24 00:20:23 +01:00
relay.rb
remote_follow.rb
report.rb Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289) 2020-03-21 03:08:09 +01:00
report_filter.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +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 Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
tombstone.rb
trending_tags.rb
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-25 10:04:41 +01:00
user_invite_request.rb
web.rb