about summary refs log tree commit diff
path: root/app/views/about
AgeCommit message (Collapse)Author
2018-08-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-22Allow use of plurals on about page stats. (#8363)M Somerville
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-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-08Show media modal on public timeline (#7413)Yamagishi Kazutoshi
2018-05-06Enable custom emojis in profiles (notes, field values, display names) (#7374)Eugen Rochko
Follow-up to #6124
2018-04-18Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json
2018-04-17Fix missing "Administered by" when timeline preview disabled (#7161)Eugen Rochko
2018-04-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: spec/views/about/show.html.haml_spec.rb
2018-04-04Add contact account to landing page ("Administered by") (#6984)Eugen Rochko
2018-03-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-13Fix #6757: Adjust RTL styles for landing page (#6768)Eugen Rochko
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-09Add missing meta description to profiles, some other SEO stuff (#6706)Eugen Rochko
- Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles
2018-03-08Improve styling of closed registrations message, rename button (#6695)Eugen Rochko
* Improve styling of closed registrations message, rename button "Sign up on another server" Fix #6683 * Adjust styling of closed registrations message
2018-03-07In wide layout, columnize Mastodon features on landing page (#6674)Eugen Rochko
2018-03-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
2018-02-26Better grid layout for the landing page (#6543)Lynx Kotoura
* Use grid layout for the landing page * Fix column settings Set the ratio explicitly * Improve information board
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-10-07Redesign public hashtag pages (#5237)Eugen Rochko
2017-09-29add login form to landing page if regs are closedOndřej Hruška
2017-09-28Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstreamOndřej Hruška
2017-09-16Adjust landing pages 2 (#4967)Lynx Kotoura
* Adjust landing pages 2 Fix styles of terms page Remove action buttons from timeline in about page Adjust styles of short description Adjust form inputs Set autocomplete off for username and email box in registration form. Remove line breakings. * Revert removing action buttons
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-08-01Merge upstream (#111)kibigo!
2017-07-30Do not create empty a element when there is no e-mail (#4455)Yamagishi Kazutoshi
Empty a element is created when there is no business e-mail input.
2017-07-30Set contact address in about/more as mailto link (#4450)Lynx Kotoura
* Set contact address as mailto link To be able to copy long email address * Set style for mailto link
2017-07-29Fix autocomplete option in haml files (#4438)Lynx Kotoura
* Fix autocomplete in two_factor.html.haml * Fix autocomplete in registrations edit.html.haml * Fix autocomplete in passwords edit.html.haml * Fix autocomplete in _registration.html.haml * Fix autocomplete in new.html.haml * Fix autocomplete in show.html.haml * Add autocomplete option to sessions new.html.haml * Add autocomplete option to 2FA new.html.haml * Add autocomplete option to 2FA show.html.haml
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 /terms page (#4338)Eugen Rochko
* Redesign /terms page * Fix tests * Remove unused keys
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-07-23New logo (#4306)Eugen Rochko
* Add new logo * Remove unused images
2017-07-22Turn clouds on landing page into SVGs, use SCSS variables to color them (#4299)Eugen Rochko
2017-07-18Add empty alt attribute to img elements in landing page (#4243)Yamagishi Kazutoshi
2017-07-14Do not load unnecessary script files (#4193)Yamagishi Kazutoshi
2017-07-11Redesign the landing page, mount public timeline on it (#4122)Eugen Rochko
* Redesign the landing page, mount public timeline on it * Adjust the standalone mounted component to the lacking of router * Adjust auth layout pages to new design * Fix tests * Standalone public timeline polling every 5 seconds * Remove now obsolete translations * Add responsive design for new landing page * Address reviews * Add floating clouds behind frontpage form * Use access token from public page when available * Fix mentions and hashtags links, cursor on status content in standalone mode * Add footer link to source code * Fix errors on pages that don't embed the component, use classnames * Fix tests * Change anonymous autoPlayGif default to false * When gif autoplay is disabled, hover to play * Add option to hide the timeline preview * Slightly improve alt layout * Add elephant friend to new frontpage * Display "back to mastodon" in place of "login" when logged in on frontpage * Change polling time to 3s
generated by cgit-pink (git 2.37.1) at 2024-12-03 04:12:27 +0000