This mirrors changes applied upstream in 7fa92267 for v5.28

Jordi Mallach authored Dec 06, 2018 and James Addison committed Jun 08, 2021

The build now fails with the simple, unindented if block.

(cherry picked from commit 9311a5af)

Emil Velikov authored May 31, 2018 and James Addison committed Jun 08, 2021

The instance has a number of changes that prevent us from using the
official client. Some even said the client was broken all together.

Either way - remove the annoying redirect.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 4126bc1b)

Jordi Mallach authored Mar 10, 2017 and James Addison committed Jun 08, 2021

Signed-off-by: Jordi Mallach <jordi.mallach@collabora.com>
Signed-off-by: Maxime “pep” Buquet <pep@collabora.com>
(cherry picked from commit 02f37b04)

* cherrypick #7851

* [Re: MM-34523] Fix failing test (#8080)

* test: freeze time

* update snapshot back

Co-authored-by: Caleb Roseland <caleb.roseland@mattermost.com>

Automatic Merge

(cherry picked from commit f5ea725e

)

Co-authored-by: Hossein <hahmadia@users.noreply.github.com>

Automatic Merge

* Removing FilesSearch feature flag

* fixing lint errors

* Fixing merge conflict

* Updating tests snapshots

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

Automatic Merge

(cherry picked from commit 66ba3562

)

Co-authored-by: Jesús Espino <jespinog@gmail.com>

(cherry picked from commit 16307efd

)

Co-authored-by: Jesús Espino <jespinog@gmail.com>

Making search result type selector independent from the search result filter in the search box (#8000) (#8032)

(cherry picked from commit 28597690

)

Co-authored-by: Jesús Espino <jespinog@gmail.com>

* Hide bots and apps UI when managed by Apps Framework

* Make OAuthAppsIDs into OAuthAppIDs

* don't hide bot account management controls

Automatic Merge

(cherry picked from commit 301dbbb0

)

Co-authored-by: Michel Engelen <32863416+michelengelen@users.noreply.github.com>

* fixing banner times

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.local>
(cherry picked from commit 963fabf9

)

Co-authored-by: Ben Cooke <benkcooke@gmail.com>

Automatic Merge

* Translated using Weblate (Swedish)

Currently translated at 99.9% (4670 of 4671 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (4671 of 4671 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (4671 of 4671 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ro/

* Translated using Weblate (Russian)

Currently translated at 99.0% (4626 of 4671 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ru/

* Translated using Weblate (Turkish)

Currently translated at 96.5% (4508 of 4671 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

* Translated using Weblate (Dutch)

Currently translated at 99.8% (4664 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/

Translated using Weblate (Dutch)

Currently translated at 98.4% (4596 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/

Translated using Weblate (Dutch)

Currently translated at 98.3% (4594 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/

* Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (4669 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/

Translated using Weblate (Turkish)

Currently translated at 97.8% (4568 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/

Translated using Weblate (Turkish)

Currently translated at 96.5% (4508 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/tr/

* Translated using Weblate (Korean)

Currently translated at 76.6% (3577 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/

Translated using Weblate (Korean)

Currently translated at 76.3% (3567 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/

* Translated using Weblate (Korean)

Currently translated at 76.3% (3567 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ko/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (4669 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/sv/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (4669 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/nl/

* Translated using Weblate (Bulgarian)

Currently translated at 98.5% (4600 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/

Translated using Weblate (Bulgarian)

Currently translated at 98.3% (4593 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/bg/

* Translated using Weblate (Russian)

Currently translated at 99.4% (4643 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/ru/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 94.7% (4424 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/zh_Hans/

* Translated using Weblate (Italian)

Currently translated at 85.6% (4000 of 4669 strings)

Translation: mattermost-languages-shipped/mattermost-webapp
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-webapp_master/it/



Co-authored-by: MArtin Johnson <martinjohnson@bahnhof.se>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
Co-authored-by: Edward Smirnov <ed@microolap.com>
Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: teamzamong <heekang@korea.ac.kr>
Co-authored-by: Jihoon Seo <jihoon.seo@etri.re.kr>
Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com>
Co-authored-by: aeomin <lin@aeomin.net>
Co-authored-by: MattoDeg <degmatt46@gmail.com>

Automatic Merge

Automatic Merge

Co-authored-by: Mmbot <mmbot@mattermost>

Automatic Merge

* Fixing accesibility problem in the search hint

* Fix accesibility on search results type selector

* Using button instead of span

* Addressing PR review comments

* Updating snapshots

* Improved accesibility of file search results

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit 142de1d1

)

Co-authored-by: Jesús Espino <jespinog@gmail.com>

(cherry picked from commit 9757eb1a

)

Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>

Automatic Merge

(cherry picked from commit 79c840cb

)

Co-authored-by: Hossein <hahmadia@users.noreply.github.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

* make button is disabled for read only admin

* update tests

* fix linting

* update snapshot

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit a8023220

)

Co-authored-by: Hossein <hahmadia@users.noreply.github.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit c9fe878a

)

Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com>

Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com>
Co-authored-by: Nick Misasi <nick.misasi@mattermost.com>
Co-authored-by: Pablo Andrés Vélez Vidal <pablovv2012@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit 0c749688

)

Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>