queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/javascript
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
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
flavours Add an option restricting secondary toot privacy to that of the toot being replied to 2018-07-12 19:15:44 +02:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
skins Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
styles Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00