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

..

concerns

Introduce StatusThreadingConcern (#3490)

2017-06-05 16:07:44 +02:00

form

Improve admin page (#4121)

2017-07-18 16:38:22 +02:00

web

Web Push Notifications (#3243)

2017-07-13 22:15:32 +02:00

account_domain_block_spec.rb

Spec AccountDomainBlock (#3816)

2017-06-18 02:59:49 +02:00

account_filter_spec.rb

Add coverage for ReportFilter and AccountFilter (#3236)

2017-05-22 15:50:58 -04:00

account_spec.rb

Merge branch 'origin/master' into sync/upstream

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

block_spec.rb

Cover Block more (#3837)

2017-06-19 11:31:37 +02:00

conversation_mute_spec.rb

Feature conversations muting (#3017)

2017-05-15 03:04:13 +02:00

conversation_spec.rb

Add conversation model, <ostatus:conversation /> (#3016)

2017-05-12 19:09:21 +02:00

domain_block_spec.rb

Cover DomainBlock more (#3838)

2017-06-19 11:31:27 +02:00

export_spec.rb

Cover Export more (#3840)

2017-06-19 11:30:27 +02:00

favourite_spec.rb

Cover Favourite more (#3841)

2017-06-19 01:38:50 +02:00

feed_spec.rb

Remove sort in Feed (#4050)

2017-07-03 13:17:27 +02:00

follow_request_spec.rb

add more tests to models

2017-04-05 00:29:56 +02:00

follow_spec.rb

Introduce recent to Follow (#3247)

2017-05-23 13:12:19 +02:00

import_spec.rb

Validate data of Imports (#4782)

2017-09-02 20:45:42 +02:00

media_attachment_spec.rb

Add media dimensions (#2448)

2017-04-26 03:48:12 +02:00

mention_spec.rb

add more tests to models

2017-04-05 00:29:56 +02:00

mute_spec.rb

Mute button progress so far. WIP, doesn't entirely work correctly.

2017-03-01 22:31:21 -06:00

notification_spec.rb

Adding unified streamable notifications

2016-11-20 19:39:58 +01:00

preview_card_spec.rb

Fix #463 - Fetch and display previews of URLs using OpenGraph tags

2017-01-20 01:00:14 +01:00

report_filter_spec.rb

Add coverage for ReportFilter and AccountFilter (#3236)

2017-05-22 15:50:58 -04:00

report_spec.rb

Reports spec for media attachments, clean up method (#2660)

2017-04-30 18:15:49 +02:00

session_activation_spec.rb

Revocable sessions (#3616)

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

status_pin_spec.rb

Pinned statuses (#4675)

2017-08-25 01:41:18 +02:00

status_spec.rb

Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)

2017-07-29 00:06:29 +02:00

stream_entry_spec.rb

Stream entry specs and refactor to use delegate (#2827)

2017-05-06 04:00:21 +02:00

subscription_spec.rb

Misc spec coverage improvements (#2821)

2017-05-05 14:56:00 -04:00

tag_spec.rb

add validation to tag name (#4194)

2017-07-14 11:02:49 +02:00

user_spec.rb

Application prefs section (#2758)

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