You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
activitypub	Process mentions and reblogs even from resolved threads (#6299)	7 years ago
ostatus	Skip ActivityPub Announces of non-public objects (#6230)	7 years ago
settings	Refactor Setting (#3302)	8 years ago
activity_tracker.rb	Fix stats expiring too quickly because of variable mistake (#6155)	7 years ago
application_extension.rb	Conditional validations no longer accept strings for if/unless (#3124)	8 years ago
delivery_failure_tracker.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	7 years ago
exceptions.rb	Add callback_url/acct information for Sidekiq PuSH workers Exception. (#4281)	7 years ago
extractor.rb	Using double splat operator (#5859)	7 years ago
feed_manager.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
formatter.rb	Don't normalize URLs in toots (#6134)	7 years ago
frontmatter_handler.rb	createBio function added	7 years ago
hash_object.rb	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings	8 years ago
inline_renderer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
language_detector.rb	Improve language filter (#5724)	7 years ago
provider_discovery.rb	Fix XML oEmbed support discovery (#6104)	7 years ago
request.rb	Using double splat operator (#5859)	7 years ago
sanitize_config.rb	[!] Sanitize incoming classlist properly (#6162)	7 years ago
status_filter.rb	Do not hide statuses from silenced accounts from other silenced accounts (#6030)	7 years ago
status_finder.rb	Raise an error for remote url in StatusFinder (#4776)	7 years ago
tag_manager.rb	Introduce OStatus::TagManager (#5008)	7 years ago
themes.rb	Screenshot support for themes	7 years ago
user_settings_decorator.rb	fixed fav setting change	7 years ago
webfinger_resource.rb	Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)	8 years ago