mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 22:17:33 +02:00
c790ecb14d
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes. |
||
|---|---|---|
| .. | ||
| 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 | ||