catstodon/app/javascript/core
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
2018-08-18 18:04:49 +02:00
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
common.js Avoid loading rails-ujs twice on vanilla flavour 2018-07-16 16:42:52 +02:00
embed.js Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
mailer.js Fixed improper mailer import 2018-01-15 21:23:26 -08:00
public.js Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
settings.js Restore glitch-soc's 500 characters limit for bios (fixes #625) 2018-08-06 08:20:29 +02:00
theme.yml Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00