David Yip
6d1023b2e9
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
Akihiko Odaki
f35fadcb9a
Unify links container implementation in about pages ( #6382 )
...
They were redundant, and also had a inconsistency; the button for
"other instances" had an icon for the external link in "more" page, but
it didn't in the other pages.
This unifies the implementation, and the external link icon is now shown
in all the about pages.
2018-02-02 10:32:21 +01:00
kibigo!
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
kibigo!
02827345ae
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
takayamaki
cfab4a7ce4
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
Ondřej Hruška
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
2017-09-28 09:12:17 +02:00
Eugen Rochko
9ff429aa6d
Uploads for admin site settings ( #4913 )
...
* Improve OpenGraph tags for about pages
* Add thumbnail admin setting
* Fix error
* Fix up
2017-09-14 00:04:30 +02:00
David Yip
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
2017-09-09 14:27:47 -05:00
Daigo 3 Dango
fd9d66dfd4
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
2017-08-22 22:54:19 +02:00
Lynx Kotoura
cbcac23679
Fix short description in about/more page ( #4554 )
2017-08-08 15:49:32 +02:00
TheInventrix
f4017cce3f
unify short description styling ( #4548 )
...
apply same style class to the About description on both the landing page
and the about/more page
2017-08-08 01:50:15 +02:00
Ondřej Hruška
74e54cd45b
Added external link icons to joinmastodon navbar buttons ( #4368 )
2017-07-26 02:00:36 +02:00
Ondřej Hruška
affd86c1dc
Add .fa-external-link to instance list link
2017-07-25 23:30:13 +02:00
Ondřej Hruška
2129485669
Fix JS errors and add back commit hash
2017-07-25 21:54:12 +02:00
Eugen Rochko
e43e0e959c
Redesign extended information page ( #4322 )
...
* Redesign extended information page
* Remove unused keys
* Add $ui-base-lighter-color variable to SCSS
2017-07-24 15:09:08 +02:00
yhirano
cf1f65bf58
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
2017-05-08 03:35:25 +02:00
Matt Jankowski
e1d3dc89fa
Fix broken spec for about/links view partial ( #2586 )
2017-04-28 16:45:24 +02:00
Ash Furrow
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 .
2017-04-21 03:30:59 +02:00
Matt Jankowski
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
2017-04-18 17:15:30 +02:00
Matt Jankowski
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
2017-04-18 00:16:32 +02:00
Matt Jankowski
f382a4f746
About page contact email ( #1839 )
...
* Correct site_contact_email typo
* Separate about more page into partials, add specs
2017-04-15 13:33:25 +02:00
Matt Jankowski
41b79ae693
Clean up about page ( #1282 )
...
* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter
2017-04-09 14:47:25 +02:00
Eugen Rochko
a6bf7b4777
Fix #487
2017-01-17 20:11:16 +01:00
Eugen Rochko
11117f5aec
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
2017-01-15 14:47:39 +01:00
Eugen Rochko
8442a176c5
Improve extended about page layout
2017-01-13 20:27:02 +01:00
Eugen Rochko
f2667139ad
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
Eugen Rochko
533448be42
Add extended about page stub
2017-01-13 03:24:41 +01:00
