73fb7bfa0f
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
6 years ago
d86033c352
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
6 years ago
56822606f4
Redesign landing page ( #10232 )
6 years ago
88d4b28714
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
caa40e9d9b
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
6 years ago
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ea57aca5e1
Replace SVG asset with Custom mascot ( #8766 )
6 years ago
ad0670fe87
Revert Font Awesome 5 upgrade ( #8810 )
...
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796 )"
This reverts commit c8a1e945d9#8799 )"
This reverts commit ae20afbc80#8792 )"
This reverts commit 30b1bb0704#8776 )"
This reverts commit 84bcf89764#8484 )"
This reverts commit cc784f3c16
6 years ago
ae20afbc80
Migrate to font-awesome 5.0. ( #8799 )
6 years ago
ae5c237607
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
d3105031f8
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
a934c4cee6
add several missing alt tags ( #8708 )
...
* add several missing alt tags
* remove alt text from mascot images
6 years ago
86d2a9d480
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
e42c06ec01
Allow use of plurals on about page stats. ( #8363 )
6 years ago
5ed6f6db1d
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
0dcd212735
Adjust responsive design for /about/more and /terms ( #8158 )
...
Follow-up to #8142
6 years ago
9e8366d4cb
Update /terms and /about/more to use public layout ( #8142 )
6 years ago
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
c1427f90f6
Show media modal on public timeline ( #7413 )
7 years ago
4055ce490c
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
7 years ago
bae5435010
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
0cdf4567c7
Fix missing "Administered by" when timeline preview disabled ( #7161 )
7 years ago
a60a600a10
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
spec/views/about/show.html.haml_spec.rb
7 years ago
7f1e924fa9
Add contact account to landing page ("Administered by") ( #6984 )
7 years ago
dd0dafed03
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
aef3f2775e
Fix #6757 : Adjust RTL styles for landing page ( #6768 )
7 years ago
54608d0486
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
83384e5390
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
f67fe3ebe8
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
ecbe445916
In wide layout, columnize Mastodon features on landing page ( #6674 )
7 years ago
c08c971dd3
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
8050d02e86
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
c0aabbec0f
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
ad1f541bd7
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
6d1023b2e9
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
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.
7 years ago
8aeda4f064
Finalized theme loading and stuff
7 years ago
02827345ae
Merge upstream 2.0ish #165
7 years ago
cfab4a7ce4
sign_in and sign_up views present og meta infos ( #5308 )
7 years ago
b98cd0041b
Redesign public hashtag pages ( #5237 )
7 years ago
18988b89cf
add login form to landing page if regs are closed
7 years ago
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
b5ec3346fa
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
9ff429aa6d
Uploads for admin site settings ( #4913 )
...
* Improve OpenGraph tags for about pages
* Add thumbnail admin setting
* Fix error
* Fix up
7 years ago
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
7 years ago
fd9d66dfd4
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
cbcac23679
Fix short description in about/more page ( #4554 )
7 years ago
f4017cce3f
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
2cdee6ae8a
Merge upstream ( #111 )
7 years ago
5d364da590
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
71bea1cd76
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
b7482e4a9f
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
74e54cd45b
Added external link icons to joinmastodon navbar buttons ( #4368 )
7 years ago
affd86c1dc
Add .fa-external-link to instance list link
7 years ago
2129485669
Fix JS errors and add back commit hash
7 years ago
fae1d9052b
Redesign /terms page ( #4338 )
...
* Redesign /terms page
* Fix tests
* Remove unused keys
7 years ago
e43e0e959c
Redesign extended information page ( #4322 )
...
* Redesign extended information page
* Remove unused keys
* Add $ui-base-lighter-color variable to SCSS
7 years ago
78c7c9fb0f
New logo ( #4306 )
...
* Add new logo
* Remove unused images
7 years ago
6ab3893157
Turn clouds on landing page into SVGs, use SCSS variables to color them ( #4299 )
7 years ago
fe4429446f
Add empty alt attribute to img elements in landing page ( #4243 )
7 years ago
5b2a54e305
Do not load unnecessary script files ( #4193 )
7 years ago
49026e27e8
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
7 years ago
68abc90aec
Customizable privacy policy from admin interface ( #4062 )
7 years ago
3d49aa4bfb
Fix ogp url ( #3802 )
8 years ago
8e32541b74
Don't show business e-mail if it's blank ( #3619 )
8 years ago
cf1f65bf58
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
8 years ago
d97e0e05e7
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.
8 years ago
ef2af79a48
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
8 years ago
e1d3dc89fa
Fix broken spec for about/links view partial ( #2586 )
8 years ago
25f76b30e0
Hide get started link when register closed ( #2583 )
8 years ago
4a6ccafa2f
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
8 years ago
ecb42d5414
Add crossorigin="anonymous" to about ( #2272 )
8 years ago
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 .
8 years ago
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
8 years ago
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
8 years ago
ef7bba3da1
Use .presence instead of ternary on site description for og: content ( #2033 )
8 years ago
cff86fedcf
Remove trailing whitespace in terms.no.html ( #1933 )
8 years ago
f382a4f746
About page contact email ( #1839 )
...
* Correct site_contact_email typo
* Separate about more page into partials, add specs
8 years ago
ec79c18aa8
views/about: use Setting.site_title instead of hardcoding ( #1508 )
8 years ago
c06f09dfe2
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
8 years ago
bd0152fb39
terms: remove redundant words ( #1578 )
...
"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.
8 years ago
3689d4aa7b
Added norwegian version of terms of service and privacy policy ( #1625 )
8 years ago
25c5f86211
[about] Moving docs link to tootsuite/documentation ( #1573 )
...
related: 4d876e9453
8 years ago
41b79ae693
Clean up about page ( #1282 )
...
* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter
8 years ago
0d9a420c1a
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
8 years ago
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
8 years ago
e407ed24a6
Fix landing page sign up form ignoring username field
8 years ago
74fb333eb7
Fix up some localizations
8 years ago
8785e271bf
Improved landing page
8 years ago
450f6cbcac
Start page links a bit more readable
8 years ago
5c7b222769
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
8 years ago
059d21c0fe
Add link to other instances list
...
This should help federation
8 years ago
a6bf7b4777
Fix #487
8 years ago
11117f5aec
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
8 years ago
8442a176c5
Improve extended about page layout
8 years ago
f2667139ad
Adding about/more page with extended information that can be set up by an admin
8 years ago
533448be42
Add extended about page stub
8 years ago
7e7c2bbb0f
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
8 years ago
ad61a21752
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
8 years ago
0c0d4b7c92
Fix sandboxed iOS login again
8 years ago
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