mastodon/app/models
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
..
admin
concerns Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
form
web
account.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
account_conversation.rb Migrate all old direct messages to new conversations schema (#9085) 2018-10-25 01:44:02 +02:00
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
admin.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
application_record.rb
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
conversation_mute.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
custom_emoji.rb Add entity cache (#7271) 2018-04-27 01:38:10 +02:00
custom_emoji_filter.rb Change custom emoji search to ILIKE instead of = (#7099) 2018-04-10 15:46:27 +02:00
custom_filter.rb Add option to not consider word boundaries when processing keyword filtering (#7975) 2018-07-09 02:22:09 +02:00
domain_block.rb
email_domain_block.rb
export.rb Show exact number of followers/statuses on export page/in tooltip (#8199) 2018-08-14 21:56:17 +02:00
favourite.rb Fix error when trying to update counters for statuses that are gone (#8251) 2018-08-18 03:03:23 +02:00
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 Add Instance class to list admin records (#3443) 2017-05-31 20:38:44 +02:00
instance_filter.rb
invite.rb
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
mention.rb
mute.rb
notification.rb
preview_card.rb
relay.rb
remote_follow.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
remote_profile.rb [WIP] Enable custom emoji on account pages and in the sidebar (#6124) 2018-04-01 23:55:42 +02:00
report.rb
report_filter.rb
report_note.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb
status_pin.rb
status_stat.rb
stream_entry.rb
subscription.rb
tag.rb
trending_tags.rb
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
web.rb