86 Commits (4850a2348c8917ae60cb6213ebd70b6105217c43)

Author	SHA1	Message	Date
Jenkins	695674b2fa	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Renato "Lond" Cerqueira	2e4a1d3109	Rename emoji sheet to avoid caching issue (#7777)	7 years ago
Thibaut Girka	c822ecfa01	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Yamagishi Kazutoshi	7e042c97d1	Use URL polyfill (#7664)	7 years ago
Akihiko Odaki	0cb1524dc1	Cache attachments on external host with service worker (#7493)	7 years ago
Thibaut Girka	efd2441d1f	Merge branch 'master' into glitch-soc/merge	7 years ago
Akihiko Odaki	0205536ee7	Limit environment variables to expose to webpack (#7480)	7 years ago
David Yip	2567d0a704	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Akihiko Odaki	e829c21cc6	Cache media (#6902)	7 years ago
David Yip	87517e2dd8	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	7 years ago
Eugen Rochko	9c212f0f28	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
Jenkins	3cd4a0804b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	8f60c22ba4	Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)	7 years ago
David Yip	a95ca95b7b	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	7 years ago
ThibG	55567d05b2	Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) ... Since 896cadceed, assets URL are absolute and not relative. Unfortunately, the domain used to build such URLs is the wrong one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.	7 years ago
David Yip	03f157f6da	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	896cadceed	Improve HTML e-mails based on Litmus tests (#6301) ... * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	7 years ago
Jenkins	86007e913d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	0fa691d2a9	Fix RFC 5646 Regular Expression (#6190)	7 years ago
kibigo!	1d7b78817a	Fixed index in webpack config	7 years ago
kibigo!	b27126f1d6	Linting fixes	7 years ago
kibigo!	99e8710095	Javascript intl8n flavour support	7 years ago
kibigo!	e614dc144e	Fixed webpack skin folder globbing	7 years ago
kibigo!	882055afd0	Rename themes -> flavours ? ?	7 years ago
kibigo!	36b9f4df56	Skins support	7 years ago
kibigo!	eadf1c38a5	Minor fixes	7 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
kibigo!	5845057adb	Themed prefetching	7 years ago
Surinna Curtis	02ae609d9a	Merge tootsuite/master at ab48f2b239	7 years ago
Yamagishi Kazutoshi	f0d800d9a9	Update extract-text-webpack-plugin to version 3.0.2 (#5584)	7 years ago
Yamagishi Kazutoshi	395a88eb5d	Upgrade compression-webpack-plugin to version 1.0.1 (#5581)	7 years ago
Nolan Lawson	ba22580c06	Add ServiceWorker caching for static assets (#5524)	7 years ago
Akihiko Odaki	38d5aa3073	Use contenthash for ExtractTextWebpackPlugin (#5462) ... [hash] is not documented.	7 years ago
kibigo!	02827345ae	Merge upstream 2.0ish #165	7 years ago
Nolan Lawson	82ff80dbad	Remove prop types from external libraries (#5304)	7 years ago
Nolan Lawson	7bde8dcc08	Use ES module build of react-router-dom (#5264)	7 years ago
aschmitz	4f7aa88461	Configure webpack to poll for changes in development (#5040) ... * Configure webpack to poll for changes in development Vagrant on Linux/macOS hosts shared files via NFS, which doens't support inotify-based watching of files. This tweak makes webpack check for changes every second, and rebuild if necessary. This removes the need to restart Foreman every time a frontend file changes. Note that rebuilding is still a relatively lengthy process. The polling frequency can be changed to taste. * Only poll in Vagrant This tests for the presence of the VAGRANT environment variable to determine whether or not we're in Vagrant. It is set in .env.vagrant, which is set up to be included in the Vagrantfile.	7 years ago
kibigo!	cae9e7ab76	Fixed webpack config code	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
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
Yamagishi Kazutoshi	9d1019bded	Disable babel-loader cache when development environment (#4684)	7 years ago
Ondřej Hruška	913dd13575	Merge remote-tracking branch 'upstream/master'	7 years ago
Yamagishi Kazutoshi	581f8b2909	Enable cache for babel-loader (#4505)	7 years ago
kibigo!	2cdee6ae8a	Merge upstream (#111)	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
Yamagishi Kazutoshi	f61858281c	Remove hash from chunk filename when dev env (#4411)	7 years ago
Satoshi KOJIMA	c6344547a3	fix #4356 : place sw.js to assets/sw.js (#4357)	7 years ago
kibigo!	0b64d60988	Fix for stylesheet split	7 years ago
Surinna Curtis	6311bfb8ff	Add sourceRoot/includePaths to loaders ... Use the settings modal as an example/testcase	7 years ago