nyastodon/app/javascript/mastodon/features/ui/components
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
..
actions_modal.js Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526) 2017-08-07 19:44:55 +02:00
boost_modal.js Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526) 2017-08-07 19:44:55 +02:00
bundle.js fix(components/bundle): Exit early in load function (#4349) 2017-07-25 01:05:44 +02:00
bundle_column_error.js Lazy load components (#3879) 2017-07-08 00:06:02 +02:00
bundle_modal_error.js Lazy load components (#3879) 2017-07-08 00:06:02 +02:00
column.js add scrollTop to ui/components/column (#4563) 2017-08-09 00:21:58 +02:00
column_header.js Improve accessibility (part 2) (#4377) 2017-07-26 13:46:53 +02:00
column_link.js Fixed onClick column links 2017-08-01 13:46:52 -07:00
column_loading.js Improve accessibility (part 2) (#4377) 2017-07-26 13:46:53 +02:00
column_subheading.js Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
columns_area.js Fix the usages of Detect Passive Events (#4749) 2017-08-31 11:20:54 +02:00
confirmation_modal.js Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
embed_modal.js Embed modal (#4748) 2017-08-31 03:38:35 +02:00
image_loader.js fix(components/media_modal): Aspect ratio (#4128) 2017-07-09 18:49:07 +02:00
media_modal.js Improve accessibility (part 7) (#4457) 2017-07-31 00:18:15 +02:00
modal_loading.js Lazy load components (#3879) 2017-07-08 00:06:02 +02:00
modal_root.js Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
onboarding_modal.js Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
report_modal.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
tabs_bar.js feat(tabs_bar): Avoid optimization for non-touch devices (#4444) 2017-07-29 21:20:34 +02:00
upload_area.js Don't unconditionally call preventDefault and stopPropagation on all keyup events (#4777) 2017-09-02 16:27:16 +02:00
video_modal.js Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00