mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-01 12:30:16 -05:00
10a0d76bf0
Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up. |
||
|---|---|---|
| .. | ||
| action_bar.jsx | ||
| autosuggest_account.jsx | ||
| character_counter.jsx | ||
| compose_form.jsx | ||
| edit_indicator.jsx | ||
| emoji_picker_dropdown.jsx | ||
| language_dropdown.jsx | ||
| navigation_bar.jsx | ||
| poll_button.jsx | ||
| poll_form.jsx | ||
| privacy_dropdown.jsx | ||
| reply_indicator.jsx | ||
| search_results.jsx | ||
| search.jsx | ||
| text_icon_button.jsx | ||
| upload_button.jsx | ||
| upload_form.jsx | ||
| upload_progress.jsx | ||
| upload.jsx | ||
| warning.jsx | ||