nyastodon/app/lib
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
..
activitypub Fix incorrect context definition for the "featured" keyword () 2018-07-30 19:33:37 +02:00
ostatus Fix N+1 on AtomSerializer () 2018-05-29 13:34:02 +02:00
settings Refactor Setting () 2017-05-25 14:14:36 +02:00
activity_tracker.rb Fix stats expiring too quickly because of variable mistake () 2018-01-02 14:02:53 +01:00
application_extension.rb Conditional validations no longer accept strings for if/unless () 2017-05-19 03:11:23 +02:00
delivery_failure_tracker.rb After 7 days of repeated delivery failures, give up on inbox () 2017-09-29 03:16:20 +02:00
entity_cache.rb Fix missing updated_at attribute on emoji EntityCache () 2018-04-30 22:49:33 +02:00
exceptions.rb Detect and prevent image bombs, max. processable dimension 4096^2 () 2018-04-23 09:16:38 +02:00
extractor.rb Using double splat operator () 2017-12-06 11:41:57 +01:00
fast_geometry_parser.rb Fix avatar and header issues by using custom geometry detector () 2018-02-21 03:40:12 +01:00
feed_manager.rb Make whole-word filter regex consistent between Ruby and JS () 2018-07-10 03:01:50 +02:00
formatter.rb Enable custom emojis in profiles (notes, field values, display names) () 2018-05-06 11:48:51 +02:00
hash_object.rb Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings 2017-01-12 20:46:24 +01:00
inline_renderer.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl () 2017-07-07 04:02:06 +02:00
language_detector.rb Disable language detection for texts shorter than 140 characters () 2018-07-14 04:05:36 +02:00
potential_friendship_tracker.rb Fix activity:interactions counter to count all interactions () 2018-07-16 18:35:43 +02:00
request.rb Merge HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY into ALLOW_ACCESS_TO_HIDDEN_SERVICE () 2018-06-29 15:36:02 +02:00
rss_builder.rb Add RSS feeds for end-users () 2018-04-25 02:10:02 +02:00
sanitize_config.rb Whitelist dat/ipfs/gopher links in sanitizer () 2018-07-16 22:17:43 +09:00
sidekiq_error_handler.rb Raise Mastodon::HostValidationError when host for HTTP request is private () 2018-02-24 19:16:11 +01:00
status_filter.rb Fix n+1 queries in StatusThreadingConcern () 2018-05-03 10:41:58 +02:00
status_finder.rb Raise an error for remote url in StatusFinder () 2017-09-02 17:42:47 +02:00
tag_manager.rb Introduce OStatus::TagManager () 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 branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
webfinger_resource.rb Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN () 2017-04-23 14:19:54 +02:00