78 Commits (023dfa119ed43fe35188e560c24cd3091c14ad0b)

Author	SHA1	Message	Date
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
Yamagishi Kazutoshi	f9afd06221	Combine similar components into one on public UI (#7458)	7 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Yamagishi Kazutoshi	16fee0335f	Show card modal on public pages (#7428)	7 years ago
Eugen Rochko	a9c440637c	Improve report layout (#7188) ... * Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue	7 years ago
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	ff7941e652	Show media modal on public pages (#6801)	7 years ago
Akihiko Odaki	7a6eaad445	Do not require images in about.js and share.js (#6622) ... They are already required by common.js.	7 years ago
abcang	8cd2828e91	Fix hide and show media button on admin page (#6347)	7 years ago
kibi!	cda845ae0e	Fix mailer to use webpack core	7 years ago
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	7 years ago
kibigo!	541fe9b110	Skins support	7 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	7 years ago
kibigo!	a9ed857171	WIP static themeing	7 years ago
kibigo!	08a01dd037	Public pack fix	7 years ago
kibigo!	45c44989c8	Forking glitch theme	7 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	7 years ago
Ondřej Hruška	37ff061d9b	satisfy eslint and jest	7 years ago
Ondřej Hruška	4b397adb5b	fix some lint errors	7 years ago
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	7 years ago
Yamagishi Kazutoshi	bf0ee1a25c	Enable ESLint rules import/* (#5414) ... * Enable ESLint rules import/* * fix	7 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	7 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	7 years ago
Nolan Lawson	fd7f0732fe	Compress and combine emoji data (#5229)	7 years ago
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	7 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	7 years ago
kibigo!	86e617a839	Better themeing support!!	7 years ago
Andrew	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	7 years ago
Eugen Rochko	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	7 years ago
unarist	47d48fed8d	Reset preview image if avatar/header image selection was cancelled (#4893)	7 years ago
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	7 years ago
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	7 years ago
Eugen Rochko	6867681c7c	Add script to make embedded iframes autosize (#4853)	7 years ago
Eugen Rochko	d1a78eba15	Embed modal (#4748) ... * Embed modal * Proxy OEmbed requests from web UI	7 years ago
Eugen Rochko	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	7 years ago
unarist	fb8aa2b3ba	Apply user timezone for the title attribute of .time-ago (#4693)	7 years ago
Eugen Rochko	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	7 years ago
Gô Shoemake	b61e3daf98	Multiple frontend support (#110) ... * Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common	7 years ago
beatrix-bitrot	984d2d4cb6	Merge that good fresh upstream shit	7 years ago
Yamagishi Kazutoshi	f2390e2803	Dynamicaly change avatar and header bg from account setting (#4289)	7 years ago
beatrix	e7edb4d1ee	Merge pull request #87 from tootsuite/master ... merge upstream	7 years ago
Cygnan	bc1f9dc24b	Fix a typo in public.js (double semicolons) (#4269) ... Signed-off-by: Cygnan <mail@cygnan.com>	7 years ago
Ondřej Hruška	d69fa9e1f4	Merge changes from upstream with the CSS reload fix	7 years ago
abcang	4d42a38954	Improve admin page (#4121) ... * Improve admin page * Fix test * Add spec * Improve select style	7 years ago
Akihiko Odaki	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.	7 years ago
Ondřej Hruška	c727eae441	Updated from tootsuite	7 years ago
Akihiko Odaki	b15f790221	Require images in common.js (#4232)	7 years ago
kibigo!	09cfc079b0	Merge upstream (#81)	7 years ago
Yamagishi Kazutoshi	9008ab3407	Do not load unnecessary script files (#4193)	7 years ago