cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

author	David Yip <yipdw@member.fsf.org>
	Sat, 9 Sep 2017 19:27:47 +0000 (14:27 -0500)
committer	David Yip <yipdw@member.fsf.org>
	Sat, 9 Sep 2017 19:27:47 +0000 (14:27 -0500)
commit	b9f7bc149b2a6abfbdaee83e6992b617b8bdb18e
tree	355225f4424a6ea1b40c66c5540ccab42096e3bf	tree \| snapshot
parent	e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37	commit \| diff
parent	5d170587e3b6c1a3b3ebe0910b62a4c526e2900d	commit \| diff

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

34 files changed:

app/javascript/mastodon/components/column.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status_action_bar.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status_list.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/containers/mastodon.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/containers/status_container.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/account/components/header.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/notifications/components/notification.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/notifications/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/status/components/action_bar.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/status/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/components/modal_root.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/components/onboarding_modal.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/util/async-components.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/defaultMessages.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/reducers/compose.js	diff1 \|	diff2 \|	blob \| history
app/javascript/packs/public.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/components.scss	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/stream_entries.scss	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/presenters/instance_presenter.rb	diff1 \|	diff2 \|	blob \| history
app/services/post_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/reblog_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/about/more.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/about/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/accounts/_header.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/home/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/layouts/application.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/stream_entries/_detailed_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
config/webpack/loaders/babel.js	diff1 \|	diff2 \|	blob \| history
spec/models/account_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/views/about/show.html.haml_spec.rb	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon

RSS Atom

This page took 0.175981 seconds and 3 git commands to generate.

app/javascript/mastodon/components/column.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status_action_bar.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status_list.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/containers/mastodon.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/containers/status_container.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/account/components/header.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/notifications/components/notification.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/notifications/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/status/components/action_bar.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/status/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/components/modal_root.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/components/onboarding_modal.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/util/async-components.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/defaultMessages.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/reducers/compose.js	diff1 \|	diff2 \|	blob \| history
app/javascript/packs/public.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/components.scss	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/stream_entries.scss	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/presenters/instance_presenter.rb	diff1 \|	diff2 \|	blob \| history
app/services/post_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/reblog_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/about/more.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/about/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/accounts/_header.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/home/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/layouts/application.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/stream_entries/_detailed_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
config/webpack/loaders/babel.js	diff1 \|	diff2 \|	blob \| history
spec/models/account_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/views/about/show.html.haml_spec.rb	diff1 \|	diff2 \|	blob \| history