luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-07 13:07:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin
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
..
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
accounts Remove unnecessary underline on accounts table (#7728) 2018-06-04 13:09:36 +02:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
change_emails
custom_emojis
domain_blocks
email_domain_blocks
instances
invites
relays Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-21 18:17:23 +00:00
settings Add admin setting to enable OG previews for sensitive media (#7962) 2018-07-06 02:15:56 +02:00
statuses Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
subscriptions