David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream ...

Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb

2017-09-09 14:27:47 -05:00

..

active_model_serializers.rb

Add recursive object support to API response (#4095)

2017-07-07 14:12:16 +02:00

application_controller_renderer.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

assets.rb

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

backtrace_silencers.rb

Initial commit

2016-02-20 22:53:20 +01:00

blacklists.rb

Quick best practice cleanup of views/helpers (#1546)

2017-04-12 18:24:18 +02:00

cookies_serializer.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

devise.rb

Extend Devise remember_me longevity to 1 year instead of 2 weeks (#4587)

2017-08-12 16:30:59 +02:00

doorkeeper.rb

Application prefs section (#2758)

2017-08-22 18:33:57 +02:00

fast_blank.rb

fix can toot whitespace (#2218)

2017-04-22 19:48:55 +02:00

filter_parameter_logging.rb

Added optional two-factor authentication

2017-01-27 20:35:16 +01:00

frontends.rb

Multiple frontend support (#110)

2017-07-30 19:28:21 +02:00

httplog.rb

Version bumps for ruby and misc gems (#1159)

2017-04-10 22:47:41 +02:00

inflections.rb

Add ActivityPub inbox (#4216)

2017-08-08 21:52:15 +02:00

instrumentation.rb

Improve StatsD instrumentation

2017-01-26 19:08:05 +01:00

json_ld.rb

Use updated ActivityStreams context (added: sharedInbox) (#4764)

2017-09-02 14:00:58 +02:00

kaminari_config.rb

OEmbed support for PreviewCard (#2337)

2017-04-27 14:42:22 +02:00

mime_types.rb

Set correct content-type for ActivityPub JSON (#4592)

2017-08-14 04:16:43 +02:00

oembed.rb

OEmbed support for PreviewCard (#2337)

2017-04-27 14:42:22 +02:00

open_uri_redirection.rb

Federate header images, fix open-uri http->https redirection error

2017-03-18 22:51:20 +01:00

ostatus.rb

Add configuration to disable private status federation over PuSH (#4582)

2017-08-24 17:51:32 +02:00

pagination.rb

Pagination improvements (#1445)

2017-04-11 01:11:41 +02:00

paperclip.rb

Fixes unknown mime type (#2822)

2017-05-05 21:32:14 +02:00

rabl_init.rb

Make sure Rabl is using Oj

2017-04-05 19:29:30 +02:00

rack_attack.rb

Add Content-Type header on throttled response to fix mojibake (#4558)

2017-08-08 15:47:35 +02:00

redis.rb

Set config.cache_store in environments file. (#3219)

2017-05-22 15:01:02 +02:00

session_activations.rb

Revocable sessions (#3616)

2017-06-23 18:50:53 +02:00

session_store.rb

Make cookies https-only if LOCAL_HTTPS is true, set X-Frame-Options to DENY,

2016-11-02 12:58:15 +01:00

sidekiq.rb

namespace redis usage (#2869)

2017-05-07 19:42:32 +02:00

simple_form.rb

Improve UI of admin site settings (#4163)

2017-07-12 03:24:04 +02:00

single_user_mode.rb

Add single user mode

2016-12-06 17:19:26 +01:00

statsd.rb

Fix key names in statsd

2017-01-26 19:46:52 +01:00

timeout.rb

Add proper error page for request timeouts

2017-04-02 19:43:44 +02:00

trusted_proxies.rb

Fix error

2017-01-22 23:07:31 +01:00

vapid.rb

Add Rake task for generate VAPID key (#4195)

2017-07-14 12:13:43 +02:00

wrap_parameters.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00