Merge pull request #1142 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml

Scroll to compose form rather than reply indicator on focus (#11182)

Merge pull request #1121 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'master' into glitch-soc/merge-upstream

Do not scroll in the compose panel on single-column (#11093)

Merge pull request #1111 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'master' into glitch-soc/merge-upstream

Fix ordering of keyboard access between CW field, textarea and emoji picker (#11066)

Merge pull request #1102 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

Merge pull request #1097 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Fix some React warnings (#10989)

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb

Fix emoji picker being always displayed (#10979)

* Fix emoji picker being always displayed

* Remove duplicate content with other pull-requests

Scroll to compose form when focus (#10970)

* Scroll to compose form when focus

* Get rid of constructor

Merge pull request #1079 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

Improvement variable height in single column layout (#10917)

* Improvement variable height of compose and navigation panel in single column layout

* Fix wrong quotes and missing commas

Merge pull request #1043 from ThibG/glitch-soc/merge-upstream

Merge upstream changes