mastodon/app/lib
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
activitypub Accept ActivityPub announce from the author of the original note (#6236) 2018-02-02 10:22:15 +01:00
ostatus Skip ActivityPub Announces of non-public objects (#6230) 2018-01-09 19:35:10 +01:00
settings
activity_tracker.rb Fix stats expiring too quickly because of variable mistake (#6155) 2018-01-02 14:02:53 +01:00
application_extension.rb
delivery_failure_tracker.rb After 7 days of repeated delivery failures, give up on inbox (#5131) 2017-09-29 03:16:20 +02:00
exceptions.rb
extractor.rb Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
feed_manager.rb Merge remote-tracking branch 'origin/master' into gs-master 2017-11-28 11:45:13 -06:00
formatter.rb Don't normalize URLs in toots (#6134) 2018-01-03 20:51:33 +01:00
frontmatter_handler.rb remove escapes from server-side γaml handler 2018-01-24 14:23:25 +01:00
hash_object.rb
inline_renderer.rb
language_detector.rb Improve language filter (#5724) 2017-11-16 13:51:38 +01:00
provider_discovery.rb Fix XML oEmbed support discovery (#6104) 2017-12-27 03:29:49 +01:00
request.rb Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
sanitize_config.rb [!] Sanitize incoming classlist properly (#6162) 2018-01-03 03:54:08 +01:00
status_filter.rb Do not hide statuses from silenced accounts from other silenced accounts (#6030) 2017-12-15 01:54:05 +01:00
status_finder.rb Raise an error for remote url in StatusFinder (#4776) 2017-09-02 17:42:47 +02:00
tag_manager.rb Introduce OStatus::TagManager (#5008) 2017-09-19 18:08:08 +02:00
themes.rb Screenshot support for themes 2017-12-10 20:32:28 -08:00
user_settings_decorator.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
webfinger_resource.rb