65fffeac3f
Redesign landing page ( #10232 )
2019-03-12 17:34:00 +01:00
dfe7322922
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
6c0a96912a
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
2019-03-09 17:07:59 +01:00
d17844e6d1
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 13:51:33 +02:00
2dba313100
Replace SVG asset with Custom mascot ( #8766 )
2018-10-08 00:20:45 +02:00
3d7f68c273
Revert Font Awesome 5 upgrade ( #8810 )
...
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796 )"
This reverts commit 3f9ec3de82#8799 )"
This reverts commit 8bae14591b#8792 )"
This reverts commit b9c727a945#8776 )"
This reverts commit 17af4d27da#8484 )"
This reverts commit 4b794e134d
2018-09-28 02:11:14 +02:00
8bae14591b
Migrate to font-awesome 5.0. ( #8799 )
2018-09-27 17:08:56 +02:00
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
2018-09-19 21:46:01 +02:00
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
2018-09-18 16:45:58 +02:00
d16c3342ce
add several missing alt tags ( #8708 )
...
* add several missing alt tags
* remove alt text from mascot images
2018-09-17 18:02:17 +02:00
e70fc059a9
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-22 20:56:32 +02:00
ad41806e53
Allow use of plurals on about page stats. ( #8363 )
2018-08-22 19:42:47 +02:00
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.
2018-08-10 16:22:31 +02:00
5b8603879f
Adjust responsive design for /about/more and /terms ( #8158 )
...
Follow-up to #8142
2018-08-10 06:43:02 +02:00
0dcc1950d1
Update /terms and /about/more to use public layout ( #8142 )
2018-08-09 12:58:20 +02:00
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
e0b1e17bd0
Show media modal on public timeline ( #7413 )
2018-05-08 13:33:09 +02:00
61a9018607
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
2018-05-06 11:48:51 +02:00
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
2018-04-18 18:48:12 -05:00
07a7d5959c
Fix missing "Administered by" when timeline preview disabled ( #7161 )
2018-04-17 13:51:14 +02:00
3ab6a8b8be
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
spec/views/about/show.html.haml_spec.rb
2018-04-04 13:56:58 -05:00
07176fed37
Add contact account to landing page ("Administered by") ( #6984 )
2018-04-04 01:11:26 +02:00
d75a6054a0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-13 18:17:20 +00:00
8bf3e750ab
Fix #6757 : Adjust RTL styles for landing page ( #6768 )
2018-03-13 08:14:08 +01:00
447d7e6127
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-09 00:17:17 +00:00
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
2018-03-09 00:35:07 +01:00
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
2018-03-08 11:10:37 +01:00
8de048fcdb
In wide layout, columnize Mastodon features on landing page ( #6674 )
2018-03-07 08:59:27 +01:00
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
2018-03-02 21:46:44 -06:00
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
2018-02-26 16:19:07 +01:00
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
2018-02-23 23:28:31 +09:00
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
2018-02-22 01:03:48 +01:00
4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
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.
2018-02-02 10:32:21 +01:00
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
552d22bec9
sign_in and sign_up views present og meta infos ( #5308 )
2017-10-11 00:52:25 +02:00
f486ef2666
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
ce3e0faf4d
add login form to landing page if regs are closed
2017-09-29 16:41:18 +02:00
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
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
2017-09-16 18:39:11 +02:00
9239e4ce4d
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
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
2017-09-09 14:27:47 -05:00
696c2c6f2f
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
dcbc1af38a
Fix short description in about/more page ( #4554 )
2017-08-08 15:49:32 +02:00
c9fd6f386c
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
8150689b48
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
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.
2017-07-30 16:24:18 +02:00
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
2017-07-30 12:56:04 +02:00
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
2017-07-29 14:20:31 +02:00
4115043dc7
Added external link icons to joinmastodon navbar buttons ( #4368 )
2017-07-26 02:00:36 +02:00
4c233b4f3a
Add .fa-external-link to instance list link
2017-07-25 23:30:13 +02:00
b7cf758fbe
Fix JS errors and add back commit hash
2017-07-25 21:54:12 +02:00
029f2c4545
Redesign /terms page ( #4338 )
...
* Redesign /terms page
* Fix tests
* Remove unused keys
2017-07-24 17:15:15 +02:00
2374d63536
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
0e0f18ce7c
New logo ( #4306 )
...
* Add new logo
* Remove unused images
2017-07-23 02:40:39 +02:00
311871eefc
Turn clouds on landing page into SVGs, use SCSS variables to color them ( #4299 )
2017-07-22 16:36:54 +02:00
8949aad030
Add empty alt attribute to img elements in landing page ( #4243 )
2017-07-18 15:22:09 +02:00
9008ab3407
Do not load unnecessary script files ( #4193 )
2017-07-14 11:08:56 +02:00
e19eefe219
Redesign the landing page, mount public timeline on it ( #4122 )
...
* 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
2017-07-11 15:27:59 +02:00
275c5b51ed
Customizable privacy policy from admin interface ( #4062 )
2017-07-04 15:19:24 +02:00
1840a352f5
Fix ogp url ( #3802 )
2017-06-16 22:38:26 +02:00
2d91944285
Don't show business e-mail if it's blank ( #3619 )
2017-06-07 09:57:47 +02:00
48594b18e6
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
dacdfec973
Added japanese version of terms of service and privacy policy ( #2703 )
...
* Added japanese version of terms of service and privacy policy
* Fix typo
* Add trasnlation for title.
* Improve translation and update the date.
2017-05-06 02:23:22 +02:00
f5bf5ebb82
Replace sprockets/browserify with Webpack ( #2617 )
...
* Replace browserify with webpack
* Add react-intl-translations-manager
* Do not minify in development, add offline-plugin for ServiceWorker background cache updates
* Adjust tests and dependencies
* Fix production deployments
* Fix tests
* More optimizations
* Improve travis cache for npm stuff
* Re-run travis
* Add back support for custom.scss as before
* Remove offline-plugin and babili
* Fix issue with Immutable.List().unshift(...values) not working as expected
* Make travis load schema instead of running all migrations in sequence
* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />
* Add react definitions to places that use JSX
* Add Procfile.dev for running rails, webpack and streaming API at the same time
2017-05-03 02:04:16 +02:00
9262f6968b
Fix broken spec for about/links view partial ( #2586 )
2017-04-28 16:45:24 +02:00
01c206326f
Hide get started link when register closed ( #2583 )
2017-04-28 15:45:37 +02:00
a1174a6d7e
Add og:url tags ( #2298 )
...
* add og:url to stream_item view
* add og:url and text to about/show
* add og:url to profile, followers and follows pages
2017-04-22 17:29:46 +02:00
ceecf96208
Add crossorigin="anonymous" to about ( #2272 )
2017-04-21 18:06:43 +02:00
a0ed88a99b
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
84b5fae8e3
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
389f8f8249
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
f96f8d0176
Use .presence instead of ternary on site description for og: content ( #2033 )
2017-04-17 23:19:45 +02:00
26ec042f38
Remove trailing whitespace in terms.no.html ( #1933 )
2017-04-16 16:38:13 +02:00
3b8908c114
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
0f889523e4
views/about: use Setting.site_title instead of hardcoding ( #1508 )
2017-04-15 13:28:09 +02:00
a6807201d2
Implementing Subresource Integrity ( #1729 )
...
* Add sprockets-rails to Gemfile
* Add sprockets-rails to Gemfile.lock
* Update show.html.haml
* Update index.html.haml
* Update admin.html.haml
* Update auth.html.haml
* Update embedded.html.haml
* Update public.html.haml
2017-04-14 11:09:20 +02:00
55b56e3f95
terms: remove redundant words ( #1578 )
...
"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.
2017-04-13 19:50:19 +02:00
e1264bbd92
Added norwegian version of terms of service and privacy policy ( #1625 )
2017-04-12 20:28:56 +02:00
fc47c1d00e
[about] Moving docs link to tootsuite/documentation ( #1573 )
...
related: 1236529e39
2017-04-11 21:57:05 +02:00
e5282e4ec0
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
ca44c13455
Use Setting.site_title value for `og:site_name` occurrences ( #1194 )
...
* Add helper method to return Setting.site_title
* Use site_title helper in application layout
* Use site_title value for og:site_name
2017-04-08 12:15:40 +02:00
5f54981846
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
433cb198fa
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
f864fee116
Fix up some localizations
2017-03-26 13:22:38 +02:00
8803ca9efe
Improved landing page
2017-03-21 19:18:37 +01:00
ac406a31b0
Start page links a bit more readable
2017-03-17 20:49:34 +01:00
38dceb3bf7
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
3f1f3d0827
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
cde0476ca2
Fix #487
2017-01-17 20:11:16 +01:00
cc1eccc8bc
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
2017-01-15 14:47:39 +01:00
7cde08e30b
Improve extended about page layout
2017-01-13 20:27:02 +01:00
c01dd089ff
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
e25170f960
Add extended about page stub
2017-01-13 03:24:41 +01:00
b11fdc3ae3
Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
...
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage
2017-01-12 20:46:24 +01:00
f876a8681d
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
2017-01-11 13:24:14 +11:00
205ba00017
Fix sandboxed iOS login again
2017-01-09 19:43:53 +01:00
819bfb75c6
Add twitter:card metatag to enable Twitter Cards support
2017-01-06 09:47:40 +11:00
b302b9202b
Add page for authorizing/rejecting follow requests
2016-12-23 00:04:52 +01:00
Eugen Rochko
Thibaut Girka
Aditoo17
ashleyhull-versent
Naoki Kosaka
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
abcang
STJrInuyasha
yhirano
gentaro
Matt Jankowski
Wesley Ellis
Ash Furrow
Alex Dunn
maxypy
Alyssa Ross
Knut Erik
lindwurm
shel
Effy Elden