91bef4759f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Vagrantfile
app/javascript/packs/public.js
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/es.yml
config/locales/simple_form.en.yml
config/webpack/configuration.js
config/webpack/loaders/babel.js
package.json
yarn.lock
Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
6 years ago
f4d549d300
Redesign forms, verify link ownership with rel="me" ( #8703 )
...
* Verify link ownership with rel="me"
* Add explanation about verification to UI
* Perform link verifications
* Add click-to-copy widget for verification HTML
* Redesign edit profile page
* Redesign forms
* Improve responsive design of settings pages
* Restore landing page sign-up form
* Fix typo
* Support <link> tags, add spec
* Fix links not being verified on first discovery and passive updates
6 years ago
d16c3342ce
add several missing alt tags ( #8708 )
...
* add several missing alt tags
* remove alt text from mascot images
6 years ago
e70fc059a9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ad41806e53
Allow use of plurals on about page stats. ( #8363 )
6 years ago
e5a603206d
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
6 years ago
5b8603879f
Adjust responsive design for /about/more and /terms ( #8158 )
...
Follow-up to #8142
6 years ago
0dcc1950d1
Update /terms and /about/more to use public layout ( #8142 )
6 years ago
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
e0b1e17bd0
Show media modal on public timeline ( #7413 )
7 years ago
61a9018607
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
7 years ago
16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/home_controller.rb
app/controllers/stream_entries_controller.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
7 years ago
07a7d5959c
Fix missing "Administered by" when timeline preview disabled ( #7161 )
7 years ago
3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
spec/views/about/show.html.haml_spec.rb
7 years ago
07176fed37
Add contact account to landing page ("Administered by") ( #6984 )
7 years ago
d75a6054a0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
8bf3e750ab
Fix #6757 : Adjust RTL styles for landing page ( #6768 )
7 years ago
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ff44b2e92d
Add missing meta description to profiles, some other SEO stuff ( #6706 )
...
- 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
7 years ago
5acd5315f2
Improve styling of closed registrations message, rename button ( #6695 )
...
* Improve styling of closed registrations message, rename button
"Sign up on another server"
Fix #6683
* Adjust styling of closed registrations message
7 years ago
8de048fcdb
In wide layout, columnize Mastodon features on landing page ( #6674 )
7 years ago
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
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
7 years ago
a40167cf4d
Better grid layout for the landing page ( #6543 )
...
* Use grid layout for the landing page
* Fix column settings
Set the ratio explicitly
* Improve information board
7 years ago
bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# 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
7 years ago
c71aa468b5
Redesign landing page (again) ( #6486 )
...
* 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
7 years ago
4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
5da5c65db8
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.
7 years ago
bdbbd06dad
Finalized theme loading and stuff
7 years ago
8d6b9ba494
Merge upstream 2.0ish #165
7 years ago
552d22bec9
sign_in and sign_up views present og meta infos ( #5308 )
7 years ago
f486ef2666
Redesign public hashtag pages ( #5237 )
7 years ago
ce3e0faf4d
add login form to landing page if regs are closed
7 years ago
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
1e3b1d7211
Adjust landing pages 2 ( #4967 )
...
* 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
7 years ago
9239e4ce4d
Uploads for admin site settings ( #4913 )
...
* Improve OpenGraph tags for about pages
* Add thumbnail admin setting
* Fix error
* Fix up
7 years ago
b9f7bc149b
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
696c2c6f2f
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
dcbc1af38a
Fix short description in about/more page ( #4554 )
7 years ago
c9fd6f386c
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
8150689b48
Merge upstream ( #111 )
7 years ago
f91284d230
Do not create empty a element when there is no e-mail ( #4455 )
...
Empty a element is created when there is no business e-mail input.
7 years ago
ea33cdc30b
Set contact address in about/more as mailto link ( #4450 )
...
* Set contact address as mailto link
To be able to copy long email address
* Set style for mailto link
7 years ago
57a794d8eb
Fix autocomplete option in haml files ( #4438 )
...
* 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
7 years ago
4115043dc7
Added external link icons to joinmastodon navbar buttons ( #4368 )
7 years ago
4c233b4f3a
Add .fa-external-link to instance list link
7 years ago
b7cf758fbe
Fix JS errors and add back commit hash
7 years ago
029f2c4545
Redesign /terms page ( #4338 )
...
* Redesign /terms page
* Fix tests
* Remove unused keys
7 years ago
2374d63536
Redesign extended information page ( #4322 )
...
* Redesign extended information page
* Remove unused keys
* Add $ui-base-lighter-color variable to SCSS
7 years ago
0e0f18ce7c
New logo ( #4306 )
...
* Add new logo
* Remove unused images
7 years ago
311871eefc
Turn clouds on landing page into SVGs, use SCSS variables to color them ( #4299 )
7 years ago
Thibaut Girka
Eugen Rochko
jacob
M Somerville
Yamagishi Kazutoshi
David Yip
Jenkins
Lynx Kotoura
imncls
Akihiko Odaki
kibigo!
takayamaki
Ondřej Hruška
Lynx Kotoura
Daigo 3 Dango
TheInventrix