mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
13 172 коммитов 3 Ветки 0 Теги
ec5c33cf14aa19e2bff8097b383ee5fc2eb91038
Граф коммитов

13172 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Miguel de la Cruz
ec5c33cf14 [MM-31357] Do not return empty appError as part of users autocompletion (#16550) 
Automatic Merge
 2020-12-15 14:45:17 +01:00
Elisabeth Kulzer
fe1c42d399 Enable circleci test only for master (#16548) 2020-12-15 14:36:00 +01:00
Jason Blais
8e221c1895 [MM-31018] Update email address for admin advisor contact requests to support-advisor@mattermost.com (#16443) 
Automatic Merge
 2020-12-15 05:15:17 +01:00
Weblate (bot)
dc561546d6 Translations update from Weblate (#16546) 
* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

* Translated using Weblate (Dutch)

Currently translated at 99.9% (2106 of 2107 strings)

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

* Translated using Weblate (Romanian)

Currently translated at 99.9% (2106 of 2107 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 94.3% (1989 of 2107 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/es/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.9% (2106 of 2107 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.9% (2106 of 2107 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/

* Translated using Weblate (Turkish)

Currently translated at 100.0% (2107 of 2107 strings)

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

* Translated using Weblate (Chinese (Simplified))

Currently translated at 99.9% (2106 of 2107 strings)

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

* Translated using Weblate (Chinese (Simplified))

Currently translated at 99.9% (2106 of 2107 strings)

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

Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
Co-authored-by: Elias  Nahum <elias@mattermost.com>
Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com>
Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: aeomin <lin@aeomin.net>
 2020-12-14 22:10:17 +01:00
Agniva De Sarker
fa1f2a8504 MM-31323: Fix racy test TestHandleCommandResponsePost (#16542) 
In https://github.com/mattermost/mattermost-server/pull/16089,
we added logic to modify the notification text in the presence
of fallback text.

Unfortunately, that created a race condition during publishing
the post via websockets. To fix this, we create a clone of the post
before sending it off for push notifications.

https://mattermost.atlassian.net/browse/MM-31323

```release-note
NONE
```
 2020-12-14 14:24:12 +05:30
Diogo Nicolau
8e2986e5ed MM-27312 Allow uploading 10 files per post (#16235) 
* Allow uploading 10 files per post

* Increase Post.Fileids column size to fit 10 files

* Add Post.Fileids column changes to DB v531

* Fix current_schema_version

Co-authored-by: Claudio Costa <cstcld91@gmail.com>

* Update store/sqlstore/upgrade.go

Co-authored-by: Claudio Costa <cstcld91@gmail.com>

* Fix schema version

Co-authored-by: Diogo Lima Nicolau <diogo.lima.nicolau@cern.ch>
Co-authored-by: Harrison Healey <harrisonmhealey@gmail.com>
Co-authored-by: Claudio Costa <cstcld91@gmail.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-14 09:30:02 +01:00
Haardik Dharma
609c8166f2 [MM-30911]: Change receiver name for (me *TestHelper) in app/slashcommands/helper_test.go to be more idiomatic. (#16387) 
Automatic Merge
 2020-12-12 15:45:17 +01:00
Haardik Dharma
0dee08fa31 Update command_me.go (#16522) 
Automatic Merge
 2020-12-12 07:15:17 +01:00
Haardik Dharma
caaa5690b6 Update command_echo.go (#16521) 
Automatic Merge
 2020-12-12 06:15:17 +01:00
Haardik Dharma
0b012ad468 [MM-31079]: Change receiver name for (me *TestHelper) in api4/apitestlib.go to be more idiomatic (#16501) 
Automatic Merge
 2020-12-12 05:15:17 +01:00
Haardik Dharma
625185cb5b Update command_online.go (#16493) 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-11 22:51:06 +05:30
Haardik Dharma
93a4c7bc7e Update command_groupmsg.go (#16487) 
Automatic Merge
 2020-12-11 17:45:18 +01:00
Haardik Dharma
b8e9bac921 Update command_code.go (#16486) 
Automatic Merge
 2020-12-11 16:45:18 +01:00
Jason Paul Deland
b363ff3fad Update Jenkinsfile.branch 
Revert changes to the branch used for saml libs
 2020-12-10 19:48:34 -05:00
Claudio Costa
6c976c3b06 Generate preview regardless of HasPreviewImage value (#16535) 
Automatic Merge
 2020-12-11 00:15:17 +01:00
Harrison Healey
1367418e3c MM-31171 Fork OpenGraph library to handle bad HTML from YouTube (#16528) 2020-12-10 15:42:23 -05:00
Jason Paul Deland
599e8f67e6 Update Jenkinsfile.branch 
Update the saml libs branch to master also
 2020-12-10 13:00:25 -05:00
Haardik Dharma
7fb5476c64 Update command_channel_header.go (#16485) 
Automatic Merge
 2020-12-10 17:15:17 +01:00
Haardik Dharma
f2aafac0c9 Update cluster_discovery.go (#16484) 
Automatic Merge
 2020-12-10 16:15:18 +01:00
Haardik Dharma
a3db701ccc Update cluster_stats.go (#16483) 
Automatic Merge
 2020-12-10 15:45:17 +01:00
Agniva De Sarker
44eb3e3f97 MM-31326: Fix Striped LRU to have minimum of 1 bucket (#16531) 
* MM-31326: Fix Striped LRU to have minimum of 1 bucket

https://mattermost.atlassian.net/browse/MM-31236

```release-note
NONE
```

* Using a maxInt function
 2020-12-10 19:51:52 +05:30
John Tzikas
1fe003aa36 Add shared channels related configuration under a E20 license check (#16415) 
* Add shared channels related configuration under a E20 license check

* Apply PR suggestions; Default config value for shared channels

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-10 11:25:38 +02:00
Ibrahim Serdar Acikgoz
5d41bffe5e [MM-30092] api4/image: add support for protocol rel. urls (#16189) 
* api4/image: add support for protocol rel. urls

* reflect review comments

* Update api4/image.go

Co-authored-by: Juho Nurminen <juho.nurminen@mattermost.com>

* api4/image: prevent opaque urls to be processed

Co-authored-by: Juho Nurminen <juho.nurminen@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-10 09:54:13 +03:00
Haardik Dharma
522181a957 Update data_retention_policy.go (#16495) 
Automatic Merge
 2020-12-09 16:15:18 +01:00
Haardik Dharma
5f0f5a7a7f Update command_shortcuts.go (#16494) 
Automatic Merge
 2020-12-09 15:45:18 +01:00
Florent Peterschmitt
349b83f23a implement and use striped LRU cache to lower mutex contention (#15764) 
* Implement Striped LRU cache

* ci

* fix

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-09 19:25:14 +05:30
Haardik Dharma
96d76760f0 Update mfa_secret.go (#16499) 
Automatic Merge
 2020-12-09 06:45:17 +01:00
Haardik Dharma
d83206e1a0 Update compliance_post.go (#16498) 
Automatic Merge
 2020-12-09 06:15:17 +01:00
Haardik Dharma
bd4d91e62b Update analytics_row.go (#16497) 
Automatic Merge
 2020-12-09 05:45:17 +01:00
Scott Bishel
f548ecbee1 MM-27688-OpenId Connect (#16222) 
* implement openid connect

* update error strings

* handle OpenIdSetting.Secret as FAKE SETTING

* add openid to telemetry

* update config defaults, add telemetry

* fix bug with Office365

* Retrieve Office365 AuthData from IdToken

* fix linter

* add feature flag, reset defaults for config

* fix build error

* fix unit tests

* add authentication permission to Feature
Flags

* turn off feature flag

* set default button color

* set default button color only on openid

* fix for merging FeatureFlags in config

* remove feature flag

* revert config changes

* remove debug statements

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-08 19:58:37 -07:00
Haardik Dharma
2a71fc5ee2 Update cluster_info.go (#16482) 
Automatic Merge
 2020-12-08 19:15:17 +01:00
Hossein
d666bb8b3d Add Billing Permissions (#16364) 
* add billing permissions

* update store.go

* Update permission.go

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-08 12:41:28 -05:00
Haardik Dharma
977ad99af6 Update command_shrug.go (#16481) 
Automatic Merge
 2020-12-08 18:15:18 +01:00
Gabe Jackson
ab7c92a28b Limit configuration database connections (#16512) 
When configuration is backed by a database, a separate pool of
connections is used for access from the primary database. This
change sets sensible config DB connection limits in order to
reduce database resource usage at scale.
 2020-12-08 11:44:30 -05:00
Weblate (bot)
d2576635cc Translations update from Weblate (#16511) 
* Translated using Weblate (Dutch)

Currently translated at 100.0% (2109 of 2109 strings)

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

Translated using Weblate (Dutch)

Currently translated at 98.8% (2085 of 2109 strings)

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

Translated using Weblate (Dutch)

Currently translated at 99.3% (2079 of 2092 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2109 of 2109 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.5% (2079 of 2109 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.3% (2079 of 2092 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/

* Translated using Weblate (Romanian)

Currently translated at 100.0% (2109 of 2109 strings)

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

Translated using Weblate (Romanian)

Currently translated at 100.0% (2109 of 2109 strings)

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

Translated using Weblate (Romanian)

Currently translated at 99.3% (2096 of 2109 strings)

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

Translated using Weblate (Romanian)

Currently translated at 99.3% (2096 of 2109 strings)

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

Translated using Weblate (Romanian)

Currently translated at 99.3% (2096 of 2109 strings)

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

* Translated using Weblate (Turkish)

Currently translated at 100.0% (2109 of 2109 strings)

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

Translated using Weblate (Turkish)

Currently translated at 99.0% (2089 of 2109 strings)

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

Translated using Weblate (Turkish)

Currently translated at 98.1% (2070 of 2109 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 100.0% (2109 of 2109 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 98.1% (2071 of 2109 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (2109 of 2109 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 100.0% (2109 of 2109 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2109 of 2109 strings)

Translation: mattermost-languages-shipped/mattermost-server_master
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/pt_BR/

Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: kaakaa <stooner.hoe@gmail.com>
Co-authored-by: aeomin <lin@aeomin.net>
Co-authored-by: Elisabeth Kulzer <elisabeth.kulzer@mattermost.com>
 2020-12-08 16:42:48 +01:00
Haardik Dharma
81854aea5c Update command_mute.go (#16479) 
Automatic Merge
 2020-12-08 11:15:17 +01:00
Jesús Espino
fb56362c45 Regenerating store mocks properly (#16506) 2020-12-08 11:36:37 +02:00
Agniva De Sarker
17194f2edf MM-30708: Fix racy TestLdapConnect/STARTTLS_connection (#16448) 
```release-note
NONE
```

https://mattermost.atlassian.net/browse/MM-30708

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-07 22:44:32 +05:30
Doug Lauder
46fc0c640c MM-30986 Move global logger init until after server logger fully configured (#16426) 
- move the initGlobalLogger call to the end of initLogging so a copy of a fully configured logger is made for global logging.
 2020-12-07 09:50:45 -05:00
Amy Blais
e8371d915f Update Dockerfile (#16488) 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-07 12:44:41 +01:00
Mohammed Salman
6e92b76932 Remove model.AppError from searchlayer/channel_layer.go (#16428) 
Automatic Merge
 2020-12-07 10:45:17 +01:00
Carlos Tadeu Panato Junior
f27c55a884 db: upgrade db to 5.30 (#16453) 
* db: upgrade db to 5.30
 2020-12-07 10:20:22 +01:00
Eli Yukelzon
86e228b6c6 MM-30558 - Add unreadReplies and unreadMentions to thread membership (#16304) 2020-12-06 10:02:53 +02:00
Jesse Hallam
cd9185fa23 MM-30801: pre-package channel export plugin (#16406) 
* MM-30801: pre-package channel export plugin

The [channel export plugin](https://github.com/mattermost/mattermost-plugin-channel-export) complements [incident management](https://github.com/mattermost/mattermost-plugin-incident-management).

* only enable IM/CE by default on enterprise ready builds
 2020-12-04 15:09:05 -04:00
Scott Bishel
3f5041fa43 add missing translation strings (#16492) 2020-12-04 11:25:10 -07:00
Ibrahim Serdar Acikgoz
cc5a12bad0 app/import_functions: fix a bug while improting for two teams (#16455) 
Automatic Merge
 2020-12-04 18:45:17 +01:00
Agniva De Sarker
d137cf0aa5 MM-31082: Use a base path for test assets (#16478) 
* MM-31082: Use a base path for test assets

Tests can be run from other tools using a different base path.
We need to respect the MM_SERVER_PATH variable for that.

https://mattermost.atlassian.net/browse/MM-31082

```release-note
NONE
```

* do not append mattermost-server if env var is set

* fix typo
 2020-12-04 20:38:07 +05:30
Ben Schumacher
f4cbecea81 [MM-30982] Add filter metadata to Marketplace response (#16446) 2020-12-04 09:19:16 +01:00
Haardik Dharma
4e2a33386b [MM-30913]: Change receiver name for (me *CollapseProvider) in app/slashcommands/command_expand_collapse.go to be more idiomatic. (#16389) 
Automatic Merge
 2020-12-04 07:15:17 +01:00
Deep Baldha
f8247a65d7 MM-30822: Change to idiomatic receiver names for model.PushNotification (#16347) 
Automatic Merge
 2020-12-04 06:15:17 +01:00