97 Commits (00fcdebed758f031b486ec239fd425fc54a180b3)

Author	SHA1	Message	Date
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	8 years ago
Yamagishi Kazutoshi	0ddbccf7e6	Upgrade Babel to version 7.0.0 (#5925)	8 years ago
Thibaut Girka	2df72d0697	Fix building assets in test environment ... Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while the javascript configuration for webpack re-reads this configuration file using the NODE_ENV environment variable. This means that when RAILS_ENV=test, running “assets:precompile” compiled the production packs in “public/packs” while webpacker expects them in “public/packs-test”. This causes Ruby to recompile them on-the-fly, possibly leading to race conditions in parallel_tests. This changes: - Disables on-the-fly compilation in test environment - Changes the javascript part to read the correct environment	8 years ago
ThibG	7fa4144d48	Fix building assets in test environment (#8691) ... Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while the javascript configuration for webpack re-reads this configuration file using the NODE_ENV environment variable. This means that when RAILS_ENV=test, running “assets:precompile” compiled the production packs in “public/packs” while webpacker expects them in “public/packs-test”. This causes Ruby to recompile them on-the-fly, possibly leading to race conditions in parallel_tests. This changes: - Disables on-the-fly compilation in test environment - Changes the javascript part to read the correct environment	8 years ago
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	8 years ago
M Somerville	2bba6e582d	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423) ... Still check for S3_CLOUDFRONT_HOST for existing installs.	8 years ago
Thibaut Girka	7317b7b231	Reduce assets precompilation time by about 20% ... Bundle most common webpack chunks into a “common” pack, in a way similar to what upstream does.	8 years ago
Thibaut Girka	7dbed4dab9	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
abcang	3c3cf7e208	Update supported Node.js version (#8041)	8 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	8 years ago
Yamagishi Kazutoshi	e9b322d0a6	Upgrade webpack to version v4.x (#6655)	8 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Renato "Lond" Cerqueira	268d90e810	Rename emoji sheet to avoid caching issue (#7777)	8 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Yamagishi Kazutoshi	13b60e6a14	Use URL polyfill (#7664)	8 years ago
Akihiko Odaki	d95642f6d9	Cache attachments on external host with service worker (#7493)	8 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	8 years ago
Akihiko Odaki	d8b3f5fb9a	Limit environment variables to expose to webpack (#7480)	8 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Akihiko Odaki	ca42f9b0eb	Cache media (#6902)	8 years ago
David Yip	f4b2478af1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	8 years ago
Eugen Rochko	97dcfb0f50	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	8 years ago
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	b1daa71da5	Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)	8 years ago
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	8 years ago
ThibG	d613dda91d	Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) ... Since 872a0d5bd8, 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.	8 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	8 years ago
Eugen Rochko	872a0d5bd8	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	8 years ago
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	9a61b0ef22	Fix RFC 5646 Regular Expression (#6190)	8 years ago
kibigo!	8aa527434c	Fixed index in webpack config	8 years ago
kibigo!	6b7085a33e	Linting fixes	8 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	8 years ago
kibigo!	753535c3c7	Fixed webpack skin folder globbing	8 years ago
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	8 years ago
kibigo!	541fe9b110	Skins support	8 years ago
kibigo!	8812bab687	Minor fixes	8 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	8 years ago
kibigo!	585758a373	Themed prefetching	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	8 years ago
Yamagishi Kazutoshi	8a588145d5	Update extract-text-webpack-plugin to version 3.0.2 (#5584)	8 years ago
Yamagishi Kazutoshi	8ae9bd0eea	Upgrade compression-webpack-plugin to version 1.0.1 (#5581)	8 years ago
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	8 years ago
Akihiko Odaki	e4080772b5	Use contenthash for ExtractTextWebpackPlugin (#5462) ... [hash] is not documented.	8 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
Nolan Lawson	bebaa6eced	Remove prop types from external libraries (#5304)	8 years ago
Nolan Lawson	7de6d269d2	Use ES module build of react-router-dom (#5264)	9 years ago
aschmitz	2076c557c9	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.	9 years ago
kibigo!	f7ca205f38	Fixed webpack config code	9 years ago
kibigo!	86e617a839	Better themeing support!!	9 years ago