mastodon/app/models
Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +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-23 10:51:07 +02:00
form Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
web
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
account_conversation.rb Fix crash when conversations have no valid participants (#10078) 2019-02-19 20:00:41 +01:00
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 Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
account_pin.rb Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
application_record.rb Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00
backup.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
block.rb
bookmark.rb
context.rb
conversation.rb Revert "Remove conversation URI (#11423)" (#11424) 2019-07-28 17:47:37 +02:00
conversation_mute.rb
custom_emoji.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
custom_emoji_category.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
custom_emoji_filter.rb
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_allow.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +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 Create DomainNormalizable#normalize_domain (#9631) 2018-12-26 06:38:42 +01:00
export.rb Export and import show_reblogs together with following list (#10495) 2019-04-08 07:28:27 +02:00
favourite.rb
featured_tag.rb Fix featured tags not finding the right tag on save (#11504) 2019-08-07 10:00:58 +02:00
feed.rb
follow.rb
follow_request.rb Fix MergeWorker being queued for remote users (#10355) 2019-03-24 12:36:26 +01:00
home_feed.rb
identity.rb
import.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
instance.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
instance_filter.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
invite.rb Fix invites not being disabled upon account suspension (#11412) 2019-07-26 18:55:33 +02:00
invite_filter.rb
list.rb
list_account.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
list_feed.rb
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00
mention.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
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 Add optimistic lock to avoid race conditions when handling votes (#10196) 2019-03-06 19:53:57 +01:00
preview_card.rb Add WebP support (#9879) 2019-02-02 12:25:04 +01:00
relay.rb Fix relay enabling/disabling not resetting inbox availability status (#10048) 2019-02-15 16:08:59 +01:00
remote_follow.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
report.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
report_filter.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
report_note.rb
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 Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
setting.rb
site_upload.rb Improvements to image upload validation and creation (#10431) 2019-04-01 07:30:46 +02:00
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
status_pin.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
status_stat.rb
tag.rb Fix account tags not being saved correctly (#11507) 2019-08-07 10:01:55 +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 Add trends UI with admin and user settings (#11502) 2019-08-06 17:57:52 +02:00
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +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 Add extended about page stub 2017-01-13 03:24:41 +01:00