Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.

2020-03-22 16:10:44 +01:00

..

admin.js

Merge branch 'master' into glitch-soc/merge-upstream

2020-03-22 16:10:44 +01: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

2020-03-22 16:10:44 +01:00

settings.js

Merge branch 'master' into glitch-soc/merge-upstream

2020-03-22 16:10:44 +01:00

theme.yml

Include necessary JS in auth pages

2019-06-13 22:38:22 +02:00