David Yip 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss

2018-01-19 15:22:10 -06:00

..

activitypub

Process mentions and reblogs even from resolved threads (#6299)

2018-01-19 19:11:35 +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

…

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

…

tag_manager.rb

…

themes.rb

Screenshot support for themes

2017-12-10 20:32:28 -08:00

user_settings_decorator.rb

fixed fav setting change

2017-12-09 12:17:20 -06:00

webfinger_resource.rb

…