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 Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02:00
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 Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb
domain_block.rb Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
email_domain_block.rb
export.rb
favourite.rb
feed.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
follow.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
follow_request.rb Limit the number of people that can be followed from one account (#8807) 2018-10-04 17:36:11 +02:00
home_feed.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
identity.rb Change identities id column to a bigint (#9371) 2018-11-27 13:56:25 +01:00
import.rb
instance.rb
instance_filter.rb
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 2018-11-27 13:23:02 +01:00
mention.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
mute.rb
notification.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
preview_card.rb
relay.rb
remote_follow.rb
remote_profile.rb
report.rb Add preference for report notification e-mails, skip for duplicates (#8559) 2018-09-02 00:11:58 +02:00
report_filter.rb
report_note.rb
search.rb
session_activation.rb
setting.rb Remove intermediary arrays when creating hash maps from results (#9291) 2018-11-16 15:02:18 +01:00
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 Reset status cache when status_stat or media_attachment updates (#9119) 2018-10-28 06:42:34 +01:00
stream_entry.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
subscription.rb
tag.rb Cache hashtag sample accounts, and exclude ineligible ones (#9465) 2018-12-08 01:32:26 +01:00
trending_tags.rb Remove intermediary arrays when creating hash maps from results (#9291) 2018-11-16 15:02:18 +01:00
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
web.rb