glitchier-soc/app/javascript/mastodon/features/compose/components
Claire e590177b29 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
action_bar.js Add link to bookmarks in web UI dropdown (#13273) 2020-03-21 03:14:28 +01:00
autosuggest_account.js
character_counter.js
compose_form.js Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
emoji_picker_dropdown.js Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003) 2020-11-05 02:21:05 +09:00
navigation_bar.js
poll_button.js
poll_form.js Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
privacy_dropdown.js Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003) 2020-11-05 02:21:05 +09:00
reply_indicator.js Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573) 2020-12-15 12:56:43 +01:00
search.js
search_results.js
text_icon_button.js
upload.js
upload_button.js Improve wording of the “Add media” button tooltip (#13954) 2020-06-26 00:14:29 +02:00
upload_form.js Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
upload_progress.js
warning.js