tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,748 Commits 10 Branches 0 Tags
cf4fd8bcfe22c8ef8e6e2a86149dec3b39adc93c
Commit Graph
109 Commits
Author SHA1 Message Date
Ondřej Hruška 4b397adb5b fix some lint errors 2017-10-16 21:13:34 +02:00
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master 2017-10-16 09:23:59 -05:00
Yamagishi KazutoshiandEugen Rochko bf0ee1a25c Enable ESLint rules import/* (#5414) 
* Enable ESLint rules import/*

* fix
 2017-10-16 11:12:09 +02:00
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
Eugen RochkoandGitHub f486ef2666 Redesign public hashtag pages (#5237) 2017-10-07 20:00:35 +02:00
Nolan LawsonandEugen Rochko fd7f0732fe Compress and combine emoji data (#5229) 2017-10-06 03:42:34 +02:00
Ondřej Hruška daad07b1d5 Merge remote-tracking branch 'origin/better-themeing' into merging-upstream 2017-09-28 09:20:59 +02:00
Ondřej Hruška 9330ea1f4d Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream 2017-09-28 09:12:17 +02:00
kibigo! 86e617a839 Better themeing support!! 2017-09-25 19:24:32 -07:00
AndrewandEugen Rochko 0401a24558 Add support for multiple themes (#4959) 
* Add support for selecting a theme

* Fix codeclimate issues

* Look up site default style if current user is not available due to e.g. not being logged in

* Remove outdated comment in common.js

* Address requested changes in themes PR

* Fix codeclimate issues

* Explicitly check current_account in application controller and only check theme availability if non-nil

* codeclimate

* explicit precedence with &&

* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml

* codeclimate: indentation + return
 2017-09-19 16:36:23 +02:00
Eugen RochkoandGitHub 2bbf987a0a Redesign video player (#4911) 
* Redesign video player

* Use new video player on static public pages too

* Use media gallery component on static public pages too

* Pause video when hiding it

* Full-screen sizing on WebKit

* Add aria labels to video player buttons

* Display link card on public status page

* Fix fullscreen from modal sizing issue

* Remove contain: strict property to fix fullscreen from columns
 2017-09-14 03:39:10 +02:00
unaristandEugen Rochko 47d48fed8d Reset preview image if avatar/header image selection was cancelled (#4893) 2017-09-11 16:19:54 +02:00
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
 2017-09-09 23:56:21 -05: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
Eugen RochkoandGitHub 6867681c7c Add script to make embedded iframes autosize (#4853) 2017-09-09 16:23:44 +02:00
Eugen RochkoandGitHub d1a78eba15 Embed modal (#4748) 
* Embed modal

* Proxy OEmbed requests from web UI
 2017-08-31 03:38:35 +02:00
Eugen RochkoandGitHub e95bdec7c5 Update status embeds (#4742) 
- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed
 2017-08-30 10:23:43 +02:00
unaristandEugen Rochko fb8aa2b3ba Apply user timezone for the title attribute of .time-ago (#4693) 2017-08-25 17:21:16 +02:00
Eugen RochkoandGitHub 3c6503038e Add protocol handler. Handle follow intents (#4511) 
* Add protocol handler. Handle follow intents

* Add share intent

* Improve code in intents controller

* Adjust share form CSS
 2017-08-14 04:53:31 +02:00
Gô ShoemakeandOndřej Hruška b61e3daf98 Multiple frontend support (#110) 
* Initial multiple frontend support

* Removed unnecessary require()

* Moved styles/images out of common
 2017-07-30 19:28:21 +02:00
beatrix-bitrot 984d2d4cb6 Merge that good fresh upstream shit 2017-07-22 01:16:53 +00:00
Yamagishi KazutoshiandEugen Rochko f2390e2803 Dynamicaly change avatar and header bg from account setting (#4289) 2017-07-21 12:47:16 +02:00
beatrixandGitHub e7edb4d1ee Merge pull request #87 from tootsuite/master 
merge upstream
 2017-07-20 11:24:32 -04:00
CygnanandEugen Rochko bc1f9dc24b Fix a typo in public.js (double semicolons) (#4269) 
Signed-off-by: Cygnan <mail@cygnan.com>
 2017-07-19 13:35:22 +02:00
Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix 2017-07-18 18:58:47 +02:00
abcangandEugen Rochko 4d42a38954 Improve admin page (#4121) 
* Improve admin page

* Fix test

* Add spec

* Improve select style
 2017-07-18 16:38:22 +02:00
Akihiko OdakiandEugen Rochko b11ac88692 Require any modules after loading polyfill in entry points (#4231) 
app/javascript/mastodon/main.js delayed the execution of modules,
but other entry points didn't. That leads to failure in executing
modules, which requires those polyfills.

Strictly enforce the rule to require any modules after loading
polyfill in entry points.
 2017-07-18 00:19:02 +02:00
Ondřej Hruška c727eae441 Updated from tootsuite 2017-07-17 20:03:57 +02:00
Akihiko OdakiandEugen Rochko b15f790221 Require images in common.js (#4232) 2017-07-17 10:23:28 +02:00
kibigo! 09cfc079b0 Merge upstream (#81) 2017-07-15 14:33:15 -07:00
Yamagishi KazutoshiandEugen Rochko 9008ab3407 Do not load unnecessary script files (#4193) 2017-07-14 11:08:56 +02:00
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
kibigo! 297921fce5 Moved glitch files to their own location ;) 2017-07-12 01:02:51 -07:00
Eugen RochkoandGitHub 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
Akihiko Odaki (@fn_aki@pawoo.net)andEugen Rochko 8784bd79d0 Require stylesheets in common.js (#4152) 
Require stylesheets in common.js because stylesheets are shared by the
entry points.
 2017-07-11 15:15:42 +02:00
abcangandEugen Rochko f76e71825d Improve Activity stream spoiler (#4088) 2017-07-06 21:31:03 +02:00
Surinna Curtis 7b53d4bbca Bio length on client side mostly doesn't count metadata 2017-06-26 09:34:31 -05:00
beatrix-bitrot c0a665865e update bio length to 500 2017-06-26 02:18:52 +00:00
Charlotte Fieldsandbeatrix-bitrot 382572c213 adding cybre changes 2017-06-23 21:45:14 +00:00
Yamagishi KazutoshiandEugen Rochko 3690f04e4a Remove comments for eslint-disable (#3691) 2017-06-11 10:42:42 +02:00
Yamagishi KazutoshiandEugen Rochko 140e73bc82 Check ready state of document in public pages (#3652) 
* Check ready state of document in public pages

* add check interactive
 2017-06-09 15:06:38 +02:00
Yamagishi KazutoshiandEugen Rochko bc4fad9e22 Change libraries path to relative (#3433) 2017-05-30 15:13:04 +02:00
Nolan LawsonandEugen Rochko b42bdd80e8 Extract polyfill loading into single module (#3421) 2017-05-30 15:11:15 +02:00
Yamagishi KazutoshiandEugen Rochko 531c1bb245 Add localization of datetime in public page (#3296) 2017-05-25 14:09:25 +02:00
Nolan LawsonandEugen Rochko 135bdd149e Name the Webpack chunks (#3291) 2017-05-25 03:30:29 +02:00
Sorin DavidoiandEugen Rochko 8e4d1cba00 Lazy load toots using IntersectionObserver (#3191) 
* refactor(components/status_list): Lazy load using IntersectionObserver

* refactor(components/status_list): Avoid setState bottleneck

* refactor(components/status_list): Update state correctly

* fix(components/status): Render if isIntersecting is undefined

* refactor(components/status): Recycle timeout

* refactor(components/status): Reduce animation duration

* refactor(components/status): Use requestIdleCallback

* chore: Split polyfill bundles

* refactor(components/status_list): Increase rootMargin to 300%

* fix(components/status): Check if onRef is not defined

* chore: Add note about polyfill bundle splitting

* fix(components/status): Reduce animation duration to 0.3 seconds
 2017-05-24 17:55:00 +02:00
Yamagishi KazutoshiandEugen Rochko 84608c3ff8 Add translations for counter of profile (#3214) 
ref #3101
 2017-05-22 04:45:55 +02:00
Yamagishi KazutoshiandEugen Rochko b280c387c8 Add MS Edge support to public.js (#3179) 2017-05-20 18:15:43 +02:00
Yamagishi KazutoshiandEugen Rochko 2e112e2406 Improve eslint rules (#3147) 
* Add semi to ESLint rules

* Add padded-blocks to ESLint rules

* Add comma-dangle to ESLint rules

* add config/webpack and storyboard

* add streaming/

* yarn test:lint -- --fix
 2017-05-20 17:31:47 +02:00
PFMandEugen Rochko 7eb8b2efad Fix JavaScript error (#3153) 
JavaScript error at Safari 10.1(macOS 10.12.4) / iPhone Safari(iOS 10.3.2)
 2017-05-19 23:33:42 +02:00