Eugen Rochko
b98cd0041b
Redesign public hashtag pages ( #5237 )
2017-10-07 20:00:35 +02:00
Ondřej Hruška
18988b89cf
add login form to landing page if regs are closed
2017-09-29 16:41:18 +02:00
Ondřej Hruška
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
2017-09-28 09:12:17 +02:00
Lynx Kotoura
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
2017-09-16 18:39:11 +02:00
Eugen Rochko
9ff429aa6d
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
David Yip
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
2017-09-09 14:27:47 -05:00
Daigo 3 Dango
fd9d66dfd4
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
Lynx Kotoura
cbcac23679
Fix short description in about/more page ( #4554 )
2017-08-08 15:49:32 +02:00
TheInventrix
f4017cce3f
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
kibigo!
2cdee6ae8a
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
Yamagishi Kazutoshi
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.
2017-07-30 16:24:18 +02:00
Lynx Kotoura
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
2017-07-30 12:56:04 +02:00
Lynx Kotoura
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
2017-07-29 14:20:31 +02:00
Ondřej Hruška
74e54cd45b
Added external link icons to joinmastodon navbar buttons ( #4368 )
2017-07-26 02:00:36 +02:00
Ondřej Hruška
affd86c1dc
Add .fa-external-link to instance list link
2017-07-25 23:30:13 +02:00
Ondřej Hruška
2129485669
Fix JS errors and add back commit hash
2017-07-25 21:54:12 +02:00
Eugen Rochko
fae1d9052b
Redesign /terms page ( #4338 )
...
* Redesign /terms page
* Fix tests
* Remove unused keys
2017-07-24 17:15:15 +02:00
Eugen Rochko
e43e0e959c
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
Eugen Rochko
78c7c9fb0f
New logo ( #4306 )
...
* Add new logo
* Remove unused images
2017-07-23 02:40:39 +02:00
Eugen Rochko
6ab3893157
Turn clouds on landing page into SVGs, use SCSS variables to color them ( #4299 )
2017-07-22 16:36:54 +02:00
Yamagishi Kazutoshi
fe4429446f
Add empty alt attribute to img elements in landing page ( #4243 )
2017-07-18 15:22:09 +02:00
Yamagishi Kazutoshi
5b2a54e305
Do not load unnecessary script files ( #4193 )
2017-07-14 11:08:56 +02:00
Eugen Rochko
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
2017-07-11 15:27:59 +02:00
Yamagishi Kazutoshi
68abc90aec
Customizable privacy policy from admin interface ( #4062 )
2017-07-04 15:19:24 +02:00
abcang
3d49aa4bfb
Fix ogp url ( #3802 )
2017-06-16 22:38:26 +02:00
STJrInuyasha
8e32541b74
Don't show business e-mail if it's blank ( #3619 )
2017-06-07 09:57:47 +02:00
yhirano
cf1f65bf58
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
gentaro
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.
2017-05-06 02:23:22 +02:00
Eugen Rochko
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
2017-05-03 02:04:16 +02:00
Matt Jankowski
e1d3dc89fa
Fix broken spec for about/links view partial ( #2586 )
2017-04-28 16:45:24 +02:00
Yamagishi Kazutoshi
25f76b30e0
Hide get started link when register closed ( #2583 )
2017-04-28 15:45:37 +02:00
Wesley Ellis
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
2017-04-22 17:29:46 +02:00
Yamagishi Kazutoshi
ecb42d5414
Add crossorigin="anonymous" to about ( #2272 )
2017-04-21 18:06:43 +02:00
Ash Furrow
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 .
2017-04-21 03:30:59 +02:00
Matt Jankowski
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
2017-04-18 17:15:30 +02:00
Matt Jankowski
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
2017-04-18 00:16:32 +02:00
Matt Jankowski
ef7bba3da1
Use .presence instead of ternary on site description for og: content ( #2033 )
2017-04-17 23:19:45 +02:00
Matt Jankowski
cff86fedcf
Remove trailing whitespace in terms.no.html ( #1933 )
2017-04-16 16:38:13 +02:00
Matt Jankowski
f382a4f746
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
Alex Dunn
ec79c18aa8
views/about: use Setting.site_title instead of hardcoding ( #1508 )
2017-04-15 13:28:09 +02:00
maxypy
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
2017-04-14 11:09:20 +02:00
Alyssa Ross
bd0152fb39
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
Knut Erik
3689d4aa7b
Added norwegian version of terms of service and privacy policy ( #1625 )
2017-04-12 20:28:56 +02:00
lindwurm
25c5f86211
[about] Moving docs link to tootsuite/documentation ( #1573 )
...
related: 4d876e9453
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-11 21:57:05 +02:00
Matt Jankowski
41b79ae693
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
Matt Jankowski
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
2017-04-08 12:15:40 +02:00
Eugen Rochko
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
Eugen Rochko
e407ed24a6
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
Eugen Rochko
74fb333eb7
Fix up some localizations
2017-03-26 13:22:38 +02:00
Eugen Rochko
8785e271bf
Improved landing page
2017-03-21 19:18:37 +01:00
Eugen Rochko
450f6cbcac
Start page links a bit more readable
2017-03-17 20:49:34 +01:00
shel
5c7b222769
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
shel
059d21c0fe
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
Eugen Rochko
a6bf7b4777
Fix #487
2017-01-17 20:11:16 +01:00
Eugen Rochko
11117f5aec
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
2017-01-15 14:47:39 +01:00
Eugen Rochko
8442a176c5
Improve extended about page layout
2017-01-13 20:27:02 +01:00
Eugen Rochko
f2667139ad
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
Eugen Rochko
533448be42
Add extended about page stub
2017-01-13 03:24:41 +01:00
Eugen Rochko
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
2017-01-12 20:46:24 +01:00
Effy Elden
ad61a21752
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
2017-01-11 13:24:14 +11:00
Eugen Rochko
0c0d4b7c92
Fix sandboxed iOS login again
2017-01-09 19:43:53 +01:00
Effy Elden
fe31b43b75
Add twitter:card metatag to enable Twitter Cards support
2017-01-06 09:47:40 +11:00
Eugen Rochko
302051ffcb
Add page for authorizing/rejecting follow requests
2016-12-23 00:04:52 +01:00
Eugen Rochko
090e3a245d
Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen
2016-12-21 00:13:13 +01:00
Eugen Rochko
6bd9019458
Add a better cropped image
2016-12-15 01:07:58 +01:00
Eugen Rochko
85acac12c2
Adding art by cutewitchirl, open graph tags for about page
2016-12-15 00:59:49 +01:00
Eugen Rochko
1b61e404b4
Localizations for most server-side strings
2016-11-16 00:55:33 +01:00
Eugen Rochko
295c9e7df1
Use privacy policy from Discourse
2016-11-13 19:35:45 +01:00
Eugen Rochko
36470feeb2
Fix follow icon changing plus to minus, add terms page stub
2016-11-01 18:05:55 +01:00
Eugen Rochko
02a90979c5
Catch 404 errors when downloading remote media, add screenshot to landing page
2016-11-01 16:58:13 +01:00
Eugen Rochko
32b6dc088e
Add window titles to auth pages and about page, link sign up/login from about page
2016-10-14 01:03:12 +02:00
Eugen Rochko
e63aebff7a
Adding landing page
2016-09-27 23:12:33 +02:00