6f85bb754b
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc |
||
|---|---|---|
| .. | ||
| action_bar.js | ||
| autosuggest_account.js | ||
| character_counter.js | ||
| compose_form.js | ||
| emoji_picker_dropdown.js | ||
| navigation_bar.js | ||
| poll_button.js | ||
| poll_form.js | ||
| privacy_dropdown.js | ||
| reply_indicator.js | ||
| search.js | ||
| search_results.js | ||
| text_icon_button.js | ||
| upload.js | ||
| upload_button.js | ||
| upload_form.js | ||
| upload_progress.js | ||
| warning.js | ||