78 Commits (4749fe5019fd120ce8a60140b05c5364d0778684)

Author	SHA1	Message	Date
Thibaut Girka	efd2441d1f	Merge branch 'master' into glitch-soc/merge	7 years ago
Yamagishi Kazutoshi	fa7cdbeb67	Combine similar components into one on public UI (#7458)	7 years ago
Thibaut Girka	af504e62ff	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Yamagishi Kazutoshi	d006271514	Show card modal on public pages (#7428)	7 years ago
Eugen Rochko	354a6e4026	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	ae55717f50	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	47d2277ef1	Show media modal on public pages (#6801)	7 years ago
Akihiko Odaki	48af504651	Do not require images in about.js and share.js (#6622) ... They are already required by common.js.	7 years ago
abcang	83a68aa224	Fix hide and show media button on admin page (#6347)	7 years ago
kibi!	be525dd4db	Fix mailer to use webpack core	7 years ago
David Yip	de7283a318	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	9613c3238c	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!	36b9f4df56	Skins support	7 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
kibigo!	e56a32a46b	WIP static themeing	7 years ago
kibigo!	f0aedba604	Public pack fix	7 years ago
kibigo!	68304a6ce5	Forking glitch theme	7 years ago
Surinna Curtis	02ae609d9a	Merge tootsuite/master at ab48f2b239	7 years ago
Ondřej Hruška	adec2b6716	satisfy eslint and jest	7 years ago
Ondřej Hruška	26e7e5f0ef	fix some lint errors	7 years ago
David Yip	e19bc7835a	Merge remote-tracking branch 'upstream/master' into gs-master	7 years ago
Yamagishi Kazutoshi	dd505c5d8c	Enable ESLint rules import/* (#5414) ... * Enable ESLint rules import/* * fix	7 years ago
kibigo!	02827345ae	Merge upstream 2.0ish #165	7 years ago
Eugen Rochko	b98cd0041b	Redesign public hashtag pages (#5237)	7 years ago
Nolan Lawson	2b34471d9d	Compress and combine emoji data (#5229)	7 years ago
Ondřej Hruška	282a126b3f	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	7 years ago
Ondřej Hruška	914c0465b1	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	7 years ago
kibigo!	aac16a82d6	Better themeing support!!	7 years ago
Andrew	b4842ef0b9	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	fbec33df62	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	b25c112d31	Reset preview image if avatar/header image selection was cancelled (#4893)	7 years ago
David Yip	017738c604	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	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
Eugen Rochko	2303725f7d	Add script to make embedded iframes autosize (#4853)	7 years ago
Eugen Rochko	ad769409f7	Embed modal (#4748) ... * Embed modal * Proxy OEmbed requests from web UI	7 years ago
Eugen Rochko	651c659fd6	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	4c8594d451	Apply user timezone for the title attribute of .time-ago (#4693)	7 years ago
Eugen Rochko	0e5c8372e7	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	58446d39d8	Multiple frontend support (#110) ... * Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common	7 years ago
beatrix-bitrot	8deb2072ef	Merge that good fresh upstream shit	7 years ago
Yamagishi Kazutoshi	5ed05aa5af	Dynamicaly change avatar and header bg from account setting (#4289)	7 years ago
beatrix	64a107bc64	Merge pull request #87 from tootsuite/master ... merge upstream	7 years ago
Cygnan	77c64924bc	Fix a typo in public.js (double semicolons) (#4269) ... Signed-off-by: Cygnan <mail@cygnan.com>	7 years ago
Ondřej Hruška	ed6c60a0c2	Merge changes from upstream with the CSS reload fix	7 years ago
abcang	e3251e74c1	Improve admin page (#4121) ... * Improve admin page * Fix test * Add spec * Improve select style	7 years ago
Akihiko Odaki	df2a07d354	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	713938f266	Updated from tootsuite	7 years ago
Akihiko Odaki	53cb659076	Require images in common.js (#4232)	7 years ago
kibigo!	f48f42598f	Merge upstream (#81)	7 years ago
Yamagishi Kazutoshi	5b2a54e305	Do not load unnecessary script files (#4193)	7 years ago