tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
f26f1145ac
mastodon/config/webpack
History
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
2018-07-16 14:50:42 +02:00
..
loaders Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
configuration.js Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
development.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
generateLocalePacks.js Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
production.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
shared.js Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
test.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
translationRunner.js Fix RFC 5646 Regular Expression (#6190) 2018-01-05 04:43:50 +01:00