tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,794 Commits 10 Branches 0 Tags
641f90e73adcc9718e610ec6c233d863e94fb92c
Commit Graph

74 Commits

Author SHA1 Message Date
kibigo!
8d6b9ba494 Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
takayamaki
552d22bec9 sign_in and sign_up views present og meta infos (#5308) 2017-10-11 00:52:25 +02:00
Eugen Rochko
f486ef2666 Redesign public hashtag pages (#5237) 2017-10-07 20:00:35 +02:00
Ondřej Hruška
ce3e0faf4d add login form to landing page if regs are closed 2017-09-29 16:41:18 +02:00
Ondřej Hruška
9330ea1f4d Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream 2017-09-28 09:12:17 +02:00
Lynx Kotoura
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
Eugen Rochko
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
David Yip
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
Daigo 3 Dango
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
Lynx Kotoura
dcbc1af38a Fix short description in about/more page (#4554) 2017-08-08 15:49:32 +02:00
TheInventrix
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
kibigo!
8150689b48 Merge upstream (#111) 2017-08-01 13:20:29 -07:00
Yamagishi Kazutoshi
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
Lynx Kotoura
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
Lynx Kotoura
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
Ondřej Hruška
4115043dc7 Added external link icons to joinmastodon navbar buttons (#4368) 2017-07-26 02:00:36 +02:00
Ondřej Hruška
4c233b4f3a Add .fa-external-link to instance list link 2017-07-25 23:30:13 +02:00
Ondřej Hruška
b7cf758fbe Fix JS errors and add back commit hash 2017-07-25 21:54:12 +02:00
Eugen Rochko
029f2c4545 Redesign /terms page (#4338) 
* Redesign /terms page

* Fix tests

* Remove unused keys
 2017-07-24 17:15:15 +02:00
Eugen Rochko
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
Eugen Rochko
0e0f18ce7c New logo (#4306) 
* Add new logo

* Remove unused images
 2017-07-23 02:40:39 +02:00
Eugen Rochko
311871eefc Turn clouds on landing page into SVGs, use SCSS variables to color them (#4299) 2017-07-22 16:36:54 +02:00
Yamagishi Kazutoshi
8949aad030 Add empty alt attribute to img elements in landing page (#4243) 2017-07-18 15:22:09 +02:00
Yamagishi Kazutoshi
9008ab3407 Do not load unnecessary script files (#4193) 2017-07-14 11:08:56 +02:00
Eugen Rochko
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
Yamagishi Kazutoshi
275c5b51ed Customizable privacy policy from admin interface (#4062) 2017-07-04 15:19:24 +02:00
abcang
1840a352f5 Fix ogp url (#3802) 2017-06-16 22:38:26 +02:00
STJrInuyasha
2d91944285 Don't show business e-mail if it's blank (#3619) 2017-06-07 09:57:47 +02:00
yhirano
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
gentaro
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
Eugen Rochko
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
Matt Jankowski
9262f6968b Fix broken spec for about/links view partial (#2586) 2017-04-28 16:45:24 +02:00
Yamagishi Kazutoshi
01c206326f Hide get started link when register closed (#2583) 2017-04-28 15:45:37 +02:00
Wesley Ellis
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
Yamagishi Kazutoshi
ceecf96208 Add crossorigin="anonymous" to about (#2272) 2017-04-21 18:06:43 +02:00
Ash Furrow
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
Matt Jankowski
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
Matt Jankowski
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
Matt Jankowski
f96f8d0176 Use .presence instead of ternary on site description for og: content (#2033) 2017-04-17 23:19:45 +02:00
Matt Jankowski
26ec042f38 Remove trailing whitespace in terms.no.html (#1933) 2017-04-16 16:38:13 +02:00
Matt Jankowski
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
Alex Dunn
0f889523e4 views/about: use Setting.site_title instead of hardcoding (#1508) 2017-04-15 13:28:09 +02:00
maxypy
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
Alyssa Ross
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
Knut Erik
e1264bbd92 Added norwegian version of terms of service and privacy policy (#1625) 2017-04-12 20:28:56 +02:00
lindwurm
fc47c1d00e [about] Moving docs link to tootsuite/documentation (#1573) 
related: 1236529e39

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
 2017-04-11 21:57:05 +02:00
Matt Jankowski
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
Matt Jankowski
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
Eugen Rochko
5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +02:00
Eugen Rochko
433cb198fa Fix landing page sign up form ignoring username field 2017-04-02 04:13:22 +02:00