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

13197 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
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
Deep Baldha
2d742600f4 MM-30818: Change to idiomatic receiver names for migrations.TestHelper (#16343) 
Automatic Merge
 2020-12-04 05:45:17 +01:00
Nick Misasi
fa5a033f66 [MM-30984] Missing payment email on billing day if no CC is present (#16442) 
* Adding email and scaffolding for payment failure in case where customer has not added payment method

* Adding email template

* Remove unused boolean

* Fix error

* Add Email Us verbiage

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-03 16:02:43 -05:00
Nick Misasi
9e968a9ef1 [MM-30973] Delinquent Account Emails: Possibility for duplicate emails to be sent (#16434) 
* Add a check to see if an email has already been sent for the current day's warning

* undo a change
 2020-12-03 14:03:16 -05:00
Gabe Jackson
fe7d9f7643 Additional Config Store Cleanup (#16440) 
This change addresses a few issues where config stores were not
properly closed when an error was encountered on server startup.
This could result in leaked database connections when dealing with
a database config store.
 2020-12-03 10:09:31 -05:00
Ibrahim Serdar Acikgoz
9283143c3b [MM-30344] utils/markdown: fix index out of range (#16250) 
* utils/markdown: fix index out of range

* reflect review comments

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-03 13:57:42 +03:00
Claudio Costa
df906cad9d [MM-28422] Enable processing of import files through API (#16062) 
* Implement unzip function

* Implement FileSize method

* Implement path rewriting for bulk import

* Small improvements

* Add ImportSettings to config

* Implement ListImports API endpoint

* Enable uploading import files

* Implement import process job

* Add missing license headers

* Address reviews

* Make path sanitization a bit smarter

* Clean path before calculating Dir

* [MM-30008] Add mmctl support for file imports (#16301)

* Add mmctl support for import files

* Improve test

* Remove unnecessary handlers

* Use th.TestForSystemAdminAndLocal

* Make nouser id a constant
 2020-12-03 11:38:00 +01:00
Jason Paul Deland
f733ee9332 Update Jenkinsfile.branch 
Adding SAML lib changes
 2020-12-02 14:23:43 -05:00
Sudheer
6cebcead22 MM-27989 Remove experimental setting for data prefetch (#16306) 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-02 11:14:30 -05:00
Jesús Espino
a74fe05695 Removing supplier concept from the sql store (#16355) 
* Removing supplier concept from the sql store

* Removing other metions to supplier

* Fixing gofmt

* Fixing gofmt

* Renaming NewSqlStore to New

* Fixing tests

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-02 12:06:23 +01:00
Ben Schumacher
11248831b8 [MM-30981] Require Plugin name in manifest (#16438) 2020-12-02 11:48:30 +01:00
Agniva De Sarker
fc60a1e8dd MM-30988 - Fix racy test ServerSystemdNotification (#16431) 
* MM-30988 - Fix racy test ServerSystemdNotification

The translateFunc is a global variable which was unguarded.
So we convert that into an atomic variable to prevent against races.

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

```release-note
NONE
```

* fix tests

* move call upwards

* use race

* after translations init

* guard with a sync.Once

* missed import

* revert race

* update timeout
 2020-12-02 14:22:41 +05:30
Haardik Dharma
e22669c403 [MM-30915]: Change receiver name for (me *JoinProvider) in app/slashcommands/command_join.go to be more idiomatic. (#16391) 
Automatic Merge
 2020-12-02 07:15:18 +01:00
Haardik Dharma
06543656ea [MM-30914]: Change receiver name for (me *InviteProvider) in app/slashcommands/command_invite.go to be more idiomatic. (#16390) 
Automatic Merge
 2020-12-02 06:15:18 +01:00
Agniva De Sarker
6ed90bf1db MM-30987- Fix race in setting clearNotify in Busy (#16430) 
A time.AfterFunc runs the function in its own goroutine. So we need
to guard that with a mutex too.

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

```release-note
NONE
```
 2020-12-02 08:49:40 +05:30
John Tzikas
3fdc6cb531 Fix misspellings and enable misspell on ci (#16285) 
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
 2020-12-01 16:27:05 +01:00
Eli Yukelzon
c2036f614e MM-30970 Add Basic unreadMentions support for collapsed threads (#16407) 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-01 17:20:23 +02:00
Eli Yukelzon
1bd7dc41bd MM-30865 Invalid Participants handling on post delete in thread (#16353) 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-12-01 16:50:39 +02:00
Haardik Dharma
64499ca767 [MM-30912]: Change receiver name for (me *RenameProvider) in app/slashcommands/command_channel_rename.go to be more idiomatic. (#16388) 
Automatic Merge
 2020-12-01 15:45:18 +01:00
Haardik Dharma
15037a510a Change receiver name for (me *InitialLoad) (#16386) 
Automatic Merge
 2020-12-01 07:15:17 +01:00
Haardik Dharma
a01927331a [MM-30909]: Change receiver name for (me *KickProvider) and (me *RemoveProvider)in app/slashcommands/command_remove.go to be more idiomatic. (#16385) 
Automatic Merge
 2020-12-01 06:15:17 +01:00
Haardik Dharma
e5df69df27 [MM-30908]: Change receiver name for (me *DndProvider) in app/slashcommands/command_dnd.go to be more idiomatic. (#16384) 
Automatic Merge
 2020-12-01 05:45:17 +01:00
Haardik Dharma
cbc66c9a37 [MM-30916]: Change receiver name for (me *LogoutProvider) in app/slashcommands/command_logout.go to be more idiomatic. (#16392) 
Automatic Merge
 2020-11-30 05:15:17 +01:00
Elisabeth Kulzer
522c86bc94 Fix empty strings. Add updates of Weblate. (#16421) 
* Translated using Weblate (Korean)

Currently translated at 90.6% (1897 of 2092 strings)

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

Translated using Weblate (Korean)

Currently translated at 91.7% (1897 of 2067 strings)

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

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.3% (2053 of 2088 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.0% (2054 of 2094 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% (2054 of 2067 strings)

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

* Translated using Weblate (Russian)

Currently translated at 94.5% (1955 of 2067 strings)

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

* Translated using Weblate (Turkish)

Currently translated at 100.0% (2094 of 2094 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 100.0% (2092 of 2092 strings)

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

* 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/

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/

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 (Chinese (Simplified))

Currently translated at 96.0% (2006 of 2088 strings)

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

* Translated using Weblate (Romanian)

Currently translated at 95.1% (1986 of 2088 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 93.2% (1948 of 2088 strings)

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

* Translated using Weblate (Dutch)

Currently translated at 97.5% (2037 of 2088 strings)

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

* 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/

* 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/

* Fix empty translation strings

Co-authored-by: Ji-Hyeon Gim <potatogim@potatogim.net>
Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com>
Co-authored-by: Alexey Napalkov <flynbit@gmail.com>
Co-authored-by: Kaya Zeren <kayazeren@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: aeomin <lin@aeomin.net>
Co-authored-by: Viorel-Cosmin Miron <cosmin@uhlhost.net>
Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-11-27 18:38:45 +01:00
Agniva De Sarker
6a56af2a14 MM-30863: Fix race in LRU (#16382) 
* MM-30863: Fix race in LRU

After shortening the critical section, we missed out the fact
that the byte slice is still accessible after the element is returned.
So the lock needs to be active until the byte slice is fully read and
unmarshaled

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

```release-note
NONE
```

* incorporate suggestions

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
 2020-11-26 20:24:23 +05:30
Eli Yukelzon
1e15ad0686 MM-30917 Fix invalid reply count calculation during thread migration (#16395) 2020-11-26 10:41:29 +02:00