mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 06:38:39 +09:00
034ffc079e
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. |
||
|---|---|---|
| .. | ||
| action_bar.js | ||
| autosuggest_account.js | ||
| character_counter.js | ||
| compose_form.js | ||
| emoji_picker_dropdown.js | ||
| navigation_bar.js | ||
| privacy_dropdown.js | ||
| reply_indicator.js | ||
| search_results.js | ||
| search.js | ||
| text_icon_button.js | ||
| upload_button.js | ||
| upload_form.js | ||
| upload_progress.js | ||
| upload.js | ||
| warning.js | ||