Commit Graph

12988 Commits

Author SHA1 Message Date
Ben Schumacher
76f1bfb941 [MM-29361] Send cloud flag with Marketplace requests (#15913) 2020-10-26 21:57:19 +01:00
Nick Misasi
3697f92045 [MM-28363] User Limit Overage Warning Emails (#16053)
* Adding files, commit of UI in good shape

* Translations added, working with activation and deactivation

* Add check for error

* Fix i18n?

* Push without subscription check so Steve and Matt can look at it

* Fix font-weight in chrome

* Fix font-weight on button

* UX fixes

* Fixes for PR

* Add back subscription stuff

* Fix tests

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-26 13:24:26 -04:00
Mario de Frutos Dieguez
b68f171162 [MM-29157] Cloud invoices logic (#16056)
* Cloud invoices logic

This commit includes all the code needed to get and print invoices
from CWS
2020-10-26 18:17:55 +01:00
Miguel de la Cruz
8f895908fc [MM-29220] Adds a client function that retrieves the full status report (#15727)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-26 15:45:58 +01:00
Claudio Costa
9484366784 Fix nil dereference panic in SearchArchivedInTeam (#16064)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-26 15:19:14 +01:00
Agniva De Sarker
72432ab3ff MM-27909: Add manage_shared_channels permission (#15601)
* MM-27909: Add manage_shared_channels permission

We add a new permission to manage shared channels.

It's a channel scoped permission and only the system admin
has that by default.

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

* change to system scoped

* Trigger CI

* Trigger CI

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-26 15:54:50 +05:30
Rodrigo Villablanca
96f1739f8f UserStore migration (#15563)
* Migration completed

* Fix tests

* Fix tests

* Fix tests

* Suggestions

* Trigger CI

* Suggestions

* Merge with master

* Trigger CI

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in>
2020-10-26 15:11:27 +05:30
Agniva De Sarker
d51d843fcd MM-22950: Remove supplier test (#16072)
This test is too flaky to be written as a test. Let's just remove it.

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

```release-note
NONE
```
2020-10-26 13:21:24 +05:30
Agniva De Sarker
087758caee MM-28737: Upgrade dependencies (#15877)
https://mattermost.atlassian.net/browse/MM-28737

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-25 22:09:55 +05:30
Agniva De Sarker
d2730014f9 MM-29525: Strip path_prefix from ListDirectory (#15949)
* MM-29525: Strip path_prefix from ListDirectory

An AWS path prefix is meant to be an implementation detail
which the calling application should not be aware of. Hence, we should
strip the path prefix when returning objects in a directory
because they anyways get applied while using the other APIs

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

* simplify

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-25 22:09:38 +05:30
Devin Binnie
79b5350576 [MM-29937] Don't allow email and contact name to be updated from the MM app (#16058)
* [MM-29937] Don't allow email and contact name to be updated from the MM app

* Switched to use omitempty
2020-10-23 15:39:36 -04:00
Daniel Espino García
910de96a33 Thread autoresponse posts with the post they are autoresponding to (#15625)
* Thread autoresponse posts with the post they are autoresponding to

* Remove unneeded if

* Remove ParentID references

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-23 16:21:21 +02:00
Elisabeth Kulzer
8c63eb7232 DOPS-243: Add manifest.txt (#15959)
* DOPS-243: Add manifest.txt

* Update build/release.mk

* Change path

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-23 09:41:33 +02:00
Scott Bishel
f46661d7a9 MM-28882:ignore guest ldap sync (#15936)
* add ignoreGuestsLdapSync to config, update interface

* update interface

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-21 20:12:12 -06:00
Scott Bishel
efc3304fe1 MM-29522:fix typo in constant name (#15933)
* fix type in constant name

* fix lint

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-21 16:59:54 -06:00
George Goldberg
9b23ee659f MM-29812: Fix a panic in auth code if GetChannel returns an error. (#16010)
* MM-29812: Don't panic if GetChannel returns an error in auth code.

* Fix gofmt

* Add further mocking.

* Another mock.

* More mocks.
2020-10-21 16:59:32 +01:00
Claudio Costa
e5e2dbdf1a [MM-29731] Fix panic in saveUserTermsOfService (#16044)
* Fix panic in saveUserTermsOfService

* Remove unneeded initialization
2020-10-21 17:08:33 +02:00
Ed Trist
91bb7d3b11 [MM-24391] Render icon_emoji names surrounded by colons in incoming webhooks (#15753) 2020-10-21 14:13:10 +02:00
Weblate (bot)
20491c2585 Translations update from Weblate (#16018)
* Translated using Weblate (Dutch)

Currently translated at 99.6% (2073 of 2081 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.6% (2073 of 2081 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.6% (2073 of 2080 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/

* Translated using Weblate (Korean)

Currently translated at 94.2% (1961 of 2081 strings)

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

* Translated using Weblate (Spanish)

Currently translated at 99.7% (2076 of 2081 strings)

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

Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
Co-authored-by: retheviper <youngbina@hotmail.com>
Co-authored-by: Elias  Nahum <elias@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-20 18:14:32 +02:00
Devin Binnie
73a1c95137 [MM-28218] API hookup for updating company info and address in MM app (#15974) 2020-10-20 11:46:58 +02:00
Ibrahim Serdar Acikgoz
c05ee81c9f [MM-28125] einterface/oauthprovide: return parsing errors (#15426)
* einterface/oauthprovide: return parsing errors

* Update app/oauth.go

* reflect review comments

* fix var name error

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-19 18:07:20 +03:00
Nick Misasi
90738de75f Add webhook event for when user status changes from activated to deactivated and vice versa (#15990)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-19 10:29:43 -04:00
Jesús Espino
f7854f9645 Skipping some telemetry tests on production builds (#16007) 2020-10-19 16:15:54 +02:00
Martin Kraft
b3260e58e2 Adds the release-note block to the PR template. (#14975)
* Adds the release-note block to the PR template.

* Update .github/PULL_REQUEST_TEMPLATE.md

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>

* Update .github/PULL_REQUEST_TEMPLATE.md

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-19 09:53:54 -04:00
Jason Paul Deland
c55f40cae9 MMCTL download migration to S3 location (#15993)
* Update to get latest release from S3

* Update mmctl to download to use S3

* Download MMCTL from S3

* Update download_mmctl_release.sh

* Update Makefile

* Update release.mk

* Update the script called, remove call to sub shell and clean up indentation

* Add quotes around THIS_BRANCH var

* Update script to support overriding the OS for packaging

* Add check for release-<Digit> to better match the branch

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-17 11:43:53 -04:00
Jason Paul Deland
e280aa1c63 Update to get latest release from S3 (#15952)
* Update to get latest release from S3

* Update mmctl to download to use S3

* Download MMCTL from S3

* Update download_mmctl_release.sh

* Update Makefile

* Update release.mk

* Update the script called, remove call to sub shell and clean up indentation

* Add quotes around THIS_BRANCH var

* Update script to support overriding the OS for packaging

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-16 20:27:50 -04:00
Devin Binnie
9b1dee7087 [MM-29723] Added websocket event constant for updating the payment status for cloud (#15988) 2020-10-16 13:23:49 -04:00
Martin Kraft
d519ab580f MM-28815: Message export query optimization. (#15757)
* MM-28815: Optimizes message export query.

* MM-28815: Removes DeleteAt WHERE condition.

* MM-28815: Adds Id to the ORDER BY clause.

* MM-28815: Concatenates the string to remove the confusing '%%' in the query.

* MM-28115: Remvoes secondary sorting.

* MM-28815: Keeps the alias in the order by.

* MM-28815: Removing forced index.

* MM-28815: Formatting.
2020-10-16 10:21:36 -04:00
Agniva De Sarker
4b57cea789 MM-29572: Add Bifrost support to codebase (#15955)
* MM-29572: Add Bifrost support to codebase

We use a custom transport for minio when an environment variable
indicates that Mattermost is running in cloud.

The transport is used to redirect the request to the S3 endpoint set
in the config. And the scheme is set depending on if S3SSL is set.

A custom credentials provider is needed to return empty credentials
which will be overridden by the service anyways. This is just to allow
the minio client library to work transparently without knowing that
there is something else in the middle intercepting requests.

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

* incorporate review comments

* Update services/filesstore/s3_overrides.go

Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>

* Change to new env key

Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
2020-10-15 22:39:23 +05:30
Eli Yukelzon
b5047e51fe on prem/cloud validation fixed (#15972) 2020-10-15 18:01:31 +03:00
Eli Yukelzon
8844141df3 MM-28249 Auto follow threads (#15878)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-15 18:01:16 +03:00
Agniva De Sarker
944841a237 MM-29573: Reuse s3 client amongst all requests (#15948)
* MM-29573: Reuse s3 client amongst all requests

An http.Client is meant as a long-term object to be reused between
consecutive requests. This reduces burden on HTTP servers by reusing TCP connections
and also makes things faster by avoiding the TCP handshake for every single request.

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

* Trigger CI

* Fix i18n

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-15 08:54:57 +05:30
Nick Misasi
e27a75fba6 [MM-29646] Add check for IsPaidTier, and don't send emails over limit for guest invites (#15958)
* Add check for ispaidtier to email invites

* Add same check for guest emails

* Update api4/team.go

Co-authored-by: Mario de Frutos Dieguez <mario@defrutos.org>

* Update api4/team.go

Co-authored-by: Mario de Frutos Dieguez <mario@defrutos.org>

* Check for an error and return if there is one

* Fix tests

* Remove test to move to enterprise repo

Co-authored-by: Mario de Frutos Dieguez <mario@defrutos.org>
2020-10-14 19:44:44 -04:00
camgraff
07948ae7bc [MM-29224] Fix bug where markdown image link doesn't show preview (#15862)
* Fix bug where markdown image has no preview

* go fmt

* Fix failing test

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-14 20:36:46 +08:00
Aayush Pal
fa9279a675 Added GoDoc for functions mentioned in Task 7 (#14004) team_store.go (#15762) 2020-10-14 12:53:48 +02:00
Scott Bishel
8e78526c84 remove ability to update SAML admin filter settings (#15932) 2020-10-13 09:55:18 -06:00
camgraff
2bf6992397 Update golangci-lint to v1.31.0 (#15909) 2020-10-13 17:08:07 +02:00
Eli Yukelzon
c9257b858e MM-29560 Correct Cloud detection in InProduct Notices (#15938)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-13 16:42:21 +03:00
Nexus Web Development
5b16ac7f13 Update file.go (#15751) 2020-10-13 15:35:19 +02:00
Weblate (bot)
d03ae9abb4 Translations update from Weblate (#15934)
* Translated using Weblate (Spanish)

Currently translated at 99.7% (2075 of 2080 strings)

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

Translated using Weblate (Spanish)

Currently translated at 99.4% (2068 of 2079 strings)

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

* 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 (Portuguese (Brazil))

Currently translated at 98.2% (2044 of 2080 strings)

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

* Translated using Weblate (Chinese (Simplified))

Currently translated at 99.5% (2071 of 2080 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.7% (2075 of 2080 strings)

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

* Translated using Weblate (Japanese)

Currently translated at 99.7% (2075 of 2080 strings)

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

Co-authored-by: Elias  Nahum <elias@mattermost.com>
Co-authored-by: rodrigocorsi <rodrigocorsi@gmail.com>
Co-authored-by: aeomin <lin@aeomin.net>
Co-authored-by: kaakaa <stooner.hoe@gmail.com>
Co-authored-by: maruTA-bis5 <bis5.wsys@gmail.com>
2020-10-13 09:44:34 +02:00
Maria A Nunez
7381b4c0e5 MM-27454 - Added CWSUrl to Client Config (#15916) 2020-10-12 22:46:22 -04:00
Scott Bishel
66a01205e6 MM-28702 - call InitEnterprise() to initialize Enterprise for cli (#15683)
* call InitServer() to initialize Enterprise for cli

* only call initEnterprise

* back to InitServer()

* move below license load

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-12 13:36:24 -06:00
Jay Pitroda
4bd1bdd792 Updated README.md (#15914)
Automatic Merge
2020-10-11 14:54:03 -04:00
Claudio Costa
00ed2b138b [MM-27277] Move away from storing uploaded files into memory (#15616)
* Move away from storing uploaded files into memory

* Improve function readability

* Fix translations

* Revert version bump

* Log error

* Fix possible race condition and goroutine leak

* Improve default case
2020-10-09 10:14:19 +02:00
Claudio Costa
73c41ef808 [MM-28638] Improve image thumbnail generation logic (#15534)
* Improve image thumbnail generation logic

* Improve naming
2020-10-09 08:47:20 +02:00
Michael Kochell
0af0a4eff4 Normalize plugin path when s3 prefix is present (#15910)
* Normalize plugin path when s3 prefix is present

* Ensure S3 is enabled and fix unit tests

Co-authored-by: Joram Wilander <jwawilander@gmail.com>
2020-10-08 22:13:27 -04:00
Mohan Sha
d8986840ac added table of contents (#15667)
Automatic Merge
2020-10-08 17:54:01 -04:00
Jeremy MacArthur
71997eaac7 Adding godocs for the 4 functions listed: (#15806)
* Adding godocs for the 4 functions listed:

SqlTeamStore.UpdateLastTeamIconUpdate
SqlTeamStore.UpdateMembersRole
SqlTeamStore.UserBelongsToTeams
SqlTeamStore.GetTeamMembersForExport

* Apply suggestions from code review

Applying suggestions from the community to help clean up the grammar in the docs.

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

* Apply suggestions from code review part 2

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-08 13:42:55 +02:00
Elisabeth Kulzer
b9f8d24cbc Move environment variables to env-file (#15820) 2020-10-08 11:24:16 +02:00
Farhan Munshi
6766853f8a [MM-28533] [MM-28532] [MM-28531] Fixes several bugs with sysconsole_write_usermanagement (#15559)
* MM-28533 Fix incorrect permission check for reset password

* Allow write users to edit other users, promote and demote guests

* Update ancillary perms for PERMISSION_SYSCONSOLE_WRITE_USERMANAGEMENT_USER

* MM-28532

* Dont allow non sysadmin to update passwords / reset passwords / patch user on sysadmins

* MM-28532: Updates test.

* MM-28533: Merge fix.

* MM-28533: Adds ability for new roles to activate/deactivate non-system-admin users.

Co-authored-by: Martin Kraft <martin@upspin.org>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2020-10-07 17:41:46 -06:00