djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 17:44:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
178e151019
tootlab-mastodon/app/javascript/mastodon/features/compose/components
History
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
2023-06-25 14:27:38 +02:00
..
action_bar.jsx Update inconsistent defaultMessage (#25114) 2023-05-24 12:38:50 +02:00
autosuggest_account.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
character_counter.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
compose_form.jsx Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
emoji_picker_dropdown.jsx Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
language_dropdown.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
navigation_bar.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
poll_button.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
poll_form.jsx Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
privacy_dropdown.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
reply_indicator.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
search_results.jsx Rewrite <LoadMore /> as FC and TS (#25259) 2023-06-06 11:28:50 +02:00
search.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
text_icon_button.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload_button.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload_form.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload_progress.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload.jsx Fix non-interactive upload container being given a button role and tabIndex (#25462) 2023-06-16 12:03:06 +02:00
warning.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00