catstodon/app/javascript/mastodon/features/compose
Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
2018-12-18 16:55:15 +01:00
..
components Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
containers Split out is_changing_upload from is_submitting (#9536) 2018-12-16 21:17:56 +01:00
util Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
index.js Display customized mascot in web UI and fix admin form for it (#8964) 2018-10-12 04:04:08 +02:00