tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'origin/master' into sync/upstream

Browse Source 
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
This commit is contained in:
David Yip
2017-09-09 14:27:47 -05:00
parent e18ed4bbc7 5d170587e3
commit b9f7bc149b
352 changed files with 8629 additions and 2380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/about/more.html.haml
View File

@ -63,9 +63,9 @@
.footer-links
.container
%p
= link_to t('about.source_code'), 'https://github.com/glitch-soc/mastodon'
= link_to t('about.source_code'), @instance_presenter.source_url
- if @instance_presenter.commit_hash == ""
%strong= @instance_presenter.version_number
%strong= " (#{@instance_presenter.version_number})"
- else
%strong= "#{@instance_presenter.version_number}, "
%strong= "#{@instance_presenter.commit_hash}"

4
app/views/about/show.html.haml
View File

@ -58,7 +58,7 @@
= @instance_presenter.closed_registrations_message.html_safe
= link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block'
.learn-more-cta
.about-short
.container
%h3= t('about.description_headline', domain: site_hostname)
%p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
@ -76,7 +76,7 @@
.footer-links
.container
%p
= link_to t('about.source_code'), 'https://github.com/glitch-soc/mastodon'
= link_to t('about.source_code'), @instance_presenter.source_url
- if @instance_presenter.commit_hash == ""
%strong= " (#{@instance_presenter.version_number})"
- else