namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/containers
History
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_container.js Make "unfollow" undo pending outgoing follow request too (#4781) 2017-09-02 20:44:41 +02:00
compose_container.js Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
dropdown_menu_container.js fix(dropdown_menu): Open as modal on mobile (#4295) 2017-07-27 22:31:59 +02:00
mastodon.js Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
status_container.js Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
timeline_container.js Redesign the landing page, mount public timeline on it (#4122) 2017-07-11 15:27:59 +02:00