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

Fix clicking on the left side of a conversation not marking it as read (#11041)

Fix can't save preference other (#11042)

[Glitch] Fix RTL layout not being RTL within the columns area

Port 25f93f40974c61b5a02770fe0b1d016213397d1d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

[Glitch] Change preferences page into appearance, notifications, and other

Port SCSS changes from 1db4117030ac69b1083ddfe7390dedb02cede421 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

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

Minor cleanup

Fix unboost confirmation dialog not showing up on detailed statuses

Add option to display a warning before boosting toots lacking media descriptions

Add DM conversations mode similar to upstream

Fix login sometimes redirecting to paths that are not pages (#11019)

Fix #11016

Fix emoji-button appearing above privacy-dropdown (#11027)

Update simple_form.sk.yml (#11028)

Update simple_form.fr.yml (#11021)

Update fr.yml (#11023)

Update fr.json (#11024)

Update sk.yml (#11015)

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml

Fix old migrations failing because of new version of `strong_migrations` (#11018)

Fix old migrations failing because of new version of `strong_migrations`

Fixes #1099

Add missing Korean translations (#11014)

i18n: Update Corsican front-end translation (#11010)

Bump version to 2.9.0rc1 (#11004)

Run yarn manage:translations (#11008)

Change priority of delete activity forwards for replies and reblogs (#11002)

Fix #11001

Fix position of search icon (#11003)

i18n: Update Catalan translations (#10998)

* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation

* i18n: Update Catalan translations

* i18n: Update Catalan translations

Fix more issues in the light theme (#10996)

* Fix tabs bar in light theme

* Fix borders on small screens in light theme

Specify gzip required in tootctl emoji help (#11000)

I18n: Update Czech translation 🇨🇿 (#10995)

* I18n: Update Czech translation

* Fix

* Re-fix

* And also this

* The real fix now (hopefully)

Put poll options behind content warnings (#10983)

* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button

Change full logo to use primary text color of the given theme (#10994)

* Change full logo to use primary text color of the given theme

* Fix colors of public layout header in light theme

Improve light theme (#10992)

Fix RTL layout not being RTL within the columns area (#10990)

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

Merge upstream changes

[Glitch] Fix not being able to directly switch between list timelines in web UI

Port 5bfd802c571a2793bb59ba4540407a6147e82f88 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

[Glitch] Fix “mark as sensitive” not being used in delete & redraft

Port 2657765d2a6804f34ce65bfdab7ec96f07d99732 to glitch-soc

[Glitch] Scroll to compose form when focus

Port 8f3c32e29cf13a84b2f0a58da0ab0c99a88caad5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

Fix some React warnings (#10989)

[Glitch] Fix refreshing featured toots when the new collection is empty

Port d34a3a2cc72c12ae5119150a8ac18dd8fb7a4e6b to glitch-soc

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

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

Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)

Fix display of alt-text when a media attachment is not available

Fix display of alt-text when a media attachment is not available (#10981)

i18n: Update Corsican translations (#10987)

Change preferences page into appearance, notifications, and other (#10977)

Add waiting time to list of pending accounts in admin UI (#10985)

Fix sass-lint config (#10982)

Change e-mail contact for CoC enforcement

Fix overlap of emoji button on search popup (#10978)

Fix CW field automatically getting the focus when it is always enabled

Fix not being able to directly switch between list timelines in web UI (#10973)

Fix “mark as sensitive” not being used in delete & redraft (#10980)

require rubocop-rails in .rubocop.yml (#10974)

* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)"

This reverts commit 121d19d7fa239c52ce86352d3fdae0649c892a20.

* Disable Rails/HelperInstanceVariable

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

Cleanup various controllers (#10972)

* Remove skip_session! as it is not supported in Rails 5

* Minor cleanup in StreamEntriesController

* Remove redundant mark_cacheable! calls

Fix potential private status leak (#10969)

Fix refreshing featured toots when the new collection is empty (#10971)

Fixes #10945

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

Merge upstream changes

Do not misattribute inlined boosts if `attributedTo` isn't present (#10967)

* Do not misattribute inlined boosts if `attributedTo` isn't present

Fixes #10950

* Fix tests

Fix margins on profile metadata in single column mode (#10961)

Change reblogs counter to be updated when boosted privately (#10964)

Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)

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

Fix poll API not requiring authentication on non-public polls (#10960)

* Fix poll API not requiring authentication on non-public polls

That API does not reveal the content of the status, i.e. the question
itself, nor who the author is, nor which status it belongs to, but it
does reveal the poll options and how many answers they got

Fix #10959

* Add test

Add profile directory link to single column navigation panel (#10963)

Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)

Add missing Korean translations (#10962)

And change some word.

Bump intersection-observer from 0.5.1 to 0.7.0 (#10953)

Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver) from 0.5.1 to 0.7.0.
- [Release notes](https://github.com/w3c/IntersectionObserver/releases)
- [Commits](https://github.com/w3c/IntersectionObserver/commits)

Replace from scss-lint to sass-lint (#10958)

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

Merge upstream changes

Use rubocop-rails (#10957)

Replace from uglifyjs to terser (#10956)

Bump babel-plugin-react-intl from 3.1.0 to 3.1.3 (#10944)

Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl) from 3.1.0 to 3.1.3.
- [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases)
- [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits)

Bump webpacker from 4.0.6 to 4.0.7 (#10948)

Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.6 to 4.0.7.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.6...v4.0.7)

Bump react-swipeable-views from 0.13.0 to 0.13.3 (#10952)

Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) from 0.13.0 to 0.13.3.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases)
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.0...v0.13.3)

Change dependabot update schedule from live to weekly (#10949)

Bump fuubar from 2.3.2 to 2.4.0 (#10947)

Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0)

Bump @babel/* from 7.3.4 to 7.4.5 (#10936)

* Bump @babel/plugin-proposal-object-rest-spread from 7.3.4 to 7.4.4

Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.3.4 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.3.4...v7.4.4)

* Bump @babel/core from 7.3.4 to 7.4.5

* Bump @babel/plugin-proposal-class-properties from 7.3.4 to 7.4.4

* Bump @babel/plugin-proposal-decorators from 7.3.0 to 7.4.4

* Bump @babel/preset-env from 7.3.4 to 7.4.5

* Bump @babel/runtime from 7.3.4 to 7.4.5

Bump react from 16.7.0 to 16.8.6 (#10935)

* Bump react from 16.7.0 to 16.8.6

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.7.0 to 16.8.6.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.8.6/packages/react)

* Bump react-dom from 16.7.0 to 16.8.6

* Bump react-test-renderer from 16.7.0 to 16.8.6

[Glitch] Fix profile picture preview

Port e13e4b28db7e066d1f6f21e306aa95b97c3ccd99 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

Handle blank poll options more gracefully (#10946)

Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.

Bump sass from 1.20.1 to 1.20.3 (#10941)

Bumps [sass](https://github.com/sass/dart-sass) from 1.20.1 to 1.20.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.20.1...1.20.3)

Bump react-intl from 2.7.2 to 2.9.0 (#10940)

Bumps [react-intl](https://github.com/yahoo/react-intl) from 2.7.2 to 2.9.0.
- [Release notes](https://github.com/yahoo/react-intl/releases)
- [Commits](https://github.com/yahoo/react-intl/compare/v2.7.2...v2.9.0)

Add audio length var to env sample

Added MAX_AUDIO_LENGTH var and documented in .env.production.sample

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

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

Bump offline-plugin from 5.0.6 to 5.0.7 (#10937)

Bumps [offline-plugin](https://github.com/NekR/offline-plugin) from 5.0.6 to 5.0.7.
- [Release notes](https://github.com/NekR/offline-plugin/releases)
- [Changelog](https://github.com/NekR/offline-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NekR/offline-plugin/compare/v5.0.6...v5.0.7)

Bump babel-jest from 24.5.0 to 24.8.0 (#10938)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.5.0 to 24.8.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.8.0/packages/babel-jest)

Revert "Bump react-redux-loading-bar from 4.0.8 to 4.2.0 (#10897)" (#10927)

This reverts commit 9ab053a4b47f971192be1e4215eaf0b2fa2f69b7.

Fix NotifyService test with regards to reblogs (#10928)

Fixes #10890

Fix profile picture preview (#10931)

Added various vars to env sample

Added several vars that are already implemented to the .env.production.sample file.
-Max bio character limit
-Number of profile fields allowed
-Max display name character limit

Fixed the very wrong byte to megabyte conversion

Correctly documented max image and video vars

Added MAX_IMAGE_SIZE and MAX_VIDEO_SIZE and documented their usage.

Added env variables for max image and video size.

I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.

Fix expanding status from menu modal in glitch-soc

Fixes #1085

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

Bump eslint-plugin-jsx-a11y from 6.1.2 to 6.2.1 (#10923)

Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.1.2 to 6.2.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.1.2...v6.2.1)

Bump jest from 24.5.0 to 24.8.0 (#10925)

Bumps [jest](https://github.com/facebook/jest) from 24.5.0 to 24.8.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.5.0...v24.8.0)

Bump webpack-dev-server from 3.2.1 to 3.5.1 (#10924)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.2.1 to 3.5.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.2.1...v3.5.1)