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

..

account.js

Generalized the infinite scrollable list (#4697)

2017-08-28 22:23:44 +02:00

attachment_list.js

Use Class and Property Decorators (#3730)

2017-06-23 19:36:54 +02:00

autosuggest_textarea.js

Improve accessibility (part 3) (#4405)

2017-07-28 00:54:48 +02:00

avatar_overlay.js

Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)

2017-08-07 19:44:55 +02:00

avatar.js

Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)

2017-08-07 19:44:55 +02:00

button.js

Use Class and Property Decorators (#3730)

2017-06-23 19:36:54 +02:00

collapsable.js

Improve eslint rules (#3147)

2017-05-20 17:31:47 +02:00

column_back_button_slim.js

Fix back button to never go to a different website using history len check

2017-07-07 05:59:15 -04:00

column_back_button.js

Merge upstream (#111)

2017-08-01 13:20:29 -07:00

column_header.js

Merge upstream (#111)

2017-08-01 13:20:29 -07:00

column.js

Merge branch 'origin/master' into sync/upstream

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

display_name.js

feat: Cache status height to avoid expensive renders (#4439)

2017-08-07 20:32:03 +02:00

dropdown_menu.js

Improve accessibility (part 6) (#4435)

2017-07-29 01:58:53 +02:00

extended_video_player.js

Quit overwriting style of extended-video-player (#4237)

2017-07-17 19:05:29 +02:00

icon_button.js

Merge upstream (#111)

2017-08-01 13:20:29 -07:00

intersection_observer_article.js

Generalized the infinite scrollable list (#4697)

2017-08-28 22:23:44 +02:00

load_more.js

Small style fixes (#4206)

2017-07-14 22:31:25 +02:00

loading_indicator.js

Add loading indicator animation (#4316)

2017-07-23 20:28:18 +02:00

media_gallery.js

Merge upstream (#111)

2017-08-01 13:20:29 -07:00

missing_indicator.js

Replace sprockets/browserify with Webpack (#2617)

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

permalink.js

Redesign the landing page, mount public timeline on it (#4122)

2017-07-11 15:27:59 +02:00

relative_timestamp.js

Use Class and Property Decorators (#3730)

2017-06-23 19:36:54 +02:00

scrollable_list.js

Generalized the infinite scrollable list (#4697)

2017-08-28 22:23:44 +02:00

setting_text.js

Improve accessibility (part 3) (#4405)

2017-07-28 00:54:48 +02:00

status_action_bar.js

Merge branch 'origin/master' into sync/upstream

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

status_content.js

Merge remote-tracking branch 'upstream/master'

2017-08-07 22:43:52 +02:00

status_list.js

Merge branch 'origin/master' into sync/upstream

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

status.js

Merge branch 'origin/master' into sync/upstream

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

video_player.js

Moved glitch containers and commented unused files

2017-07-13 02:40:16 -07:00