about summary refs log tree commit diff
path: root/app/views/about/more.html.haml
AgeCommit message (Collapse)Author
2018-08-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-10Adjust responsive design for /about/more and /terms (#8158)Eugen Rochko
Follow-up to #8142
2018-08-09Update /terms and /about/more to use public layout (#8142)Eugen Rochko
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
2018-02-22Redesign landing page (again) (#6486)Eugen Rochko
* Redesign landing page (again) * Move login form in small version to the right column * Display closed registrations message * Add site setting for the hero image * Fix test * Increase spacing, maximum width, change call to action section
2018-02-02Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss
2018-02-02Unify links container implementation in about pages (#6382)Akihiko Odaki
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.
2017-11-20Finalized theme loading and stuffkibigo!
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-11sign_in and sign_up views present og meta infos (#5308)takayamaki
2017-09-28Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstreamOndřej Hruška
2017-09-14Uploads for admin site settings (#4913)Eugen Rochko
* Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
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-08-22Add Mastodon::Source.url (#4643)Daigo 3 Dango
* Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version
2017-08-08Fix short description in about/more page (#4554)Lynx Kotoura
2017-08-08unify short description styling (#4548)TheInventrix
apply same style class to the About description on both the landing page and the about/more page
2017-07-26Added external link icons to joinmastodon navbar buttons (#4368)Ondřej Hruška
2017-07-25Add .fa-external-link to instance list linkOndřej Hruška
2017-07-25Fix JS errors and add back commit hashOndřej Hruška
2017-07-24Redesign extended information page (#4322)Eugen Rochko
* Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS
2017-05-08Added haml-lint and fix warnings (#2773)yhirano
* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
2017-04-28Fix broken spec for about/links view partial (#2586)Matt Jankowski
2017-04-21Adds version to about/more and API (#2181)Ash Furrow
* Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.
2017-04-18Simplify renders in views (#2084)Matt Jankowski
* 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-18Instance helper to replace site title helper (#2038)Matt Jankowski
* 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-15About page contact email (#1839)Matt Jankowski
* Correct site_contact_email typo * Separate about more page into partials, add specs
2017-04-09Clean up about page (#1282)Matt Jankowski
* Add InstancePresenter to expose site details * Clean up about controller, use instance presenter
2017-01-17Fix #487Eugen Rochko
2017-01-15Fix #466 - when logged in, make "get started" link to the frontpage instead ↵Eugen Rochko
of sign up
2017-01-13Improve extended about page layoutEugen Rochko
2017-01-13Adding about/more page with extended information that can be set up by an adminEugen Rochko
2017-01-13Add extended about page stubEugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-12-23 21:48:26 +0000