914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
9ff429aa6d
Uploads for admin site settings ( #4913 )
...
* Improve OpenGraph tags for about pages
* Add thumbnail admin setting
* Fix error
* Fix up
7 years ago
da3f22ee7d
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
7 years ago
fd9d66dfd4
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
cbcac23679
Fix short description in about/more page ( #4554 )
7 years ago
f4017cce3f
unify short description styling ( #4548 )
...
apply same style class to the About description on both the landing page
and the about/more page
7 years ago
74e54cd45b
Added external link icons to joinmastodon navbar buttons ( #4368 )
7 years ago
affd86c1dc
Add .fa-external-link to instance list link
7 years ago
2129485669
Fix JS errors and add back commit hash
7 years ago
e43e0e959c
Redesign extended information page ( #4322 )
...
* Redesign extended information page
* Remove unused keys
* Add $ui-base-lighter-color variable to SCSS
7 years ago
cf1f65bf58
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
8 years ago
e1d3dc89fa
Fix broken spec for about/links view partial ( #2586 )
8 years ago
c229532144
Adds version to about/more and API ( #2181 )
...
* Adds version.
* Cleans up code.
* Removes standalone endpoint and adds version to instance endpoint.
* Addresses feedback from #2181 .
8 years ago
2a86067f5e
Simplify renders in views ( #2084 )
...
* Simplify render in mailer views
* Simplify render in about/more view
* Simplify render in accounts follow views
* Simplify render in recovery code views
* Simplify render in stream entry embed
* Simplify render in stream entries status partial
* Simplify render in authorize follow new view
8 years ago
d087c95aa7
Instance helper to replace site title helper ( #2038 )
...
* Move site title helper to instance helper (name change only)
* Remove newline in <title> tag
* Add site_hostname helper method to wrap up local_domain value
* Use site_hostname helper in places that need local_domain value
8 years ago
f382a4f746
About page contact email ( #1839 )
...
* Correct site_contact_email typo
* Separate about more page into partials, add specs
8 years ago
41b79ae693
Clean up about page ( #1282 )
...
* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter
8 years ago
a6bf7b4777
Fix #487
8 years ago
11117f5aec
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
8 years ago
8442a176c5
Improve extended about page layout
8 years ago
f2667139ad
Adding about/more page with extended information that can be set up by an admin
8 years ago
533448be42
Add extended about page stub
8 years ago
Ondřej Hruška
Eugen Rochko
David Yip
Daigo 3 Dango
Lynx Kotoura
TheInventrix
yhirano
Matt Jankowski
Ash Furrow