Граф коммитов

2407 Коммитов

Автор SHA1 Сообщение Дата
Conor Macpherson
1f1e83a16c MM-47838 - Conclude A/B test for upgrade button (#21508)
Automatic Merge
2022-10-28 01:10:25 +03:00
Said Atrahouch
effbf7d620 Merge pull request #21486 from mattermost/mm-46549-gather-intent-cloud-monthly-subscription
Mm 46549 gather intent cloud monthly subscription
2022-10-27 11:42:06 +02:00
Tim Scheuermann
6d162bc1ce Fixed job.IsValid and added tests (#21501) 2022-10-27 10:02:30 +02:00
Shota Gvinepadze
96c8dc1281 [MM-45868] Replace TeamId column with ThreadTeamId (#21505)
* Replace TeamId column with TreadTeamId

* make migrations-extract
2022-10-26 19:50:37 +04:00
cyrilzhang-mm
82096a8cbb [MM-44336] Add timestamp parameter to test data slash commands (#21400) 2022-10-26 09:08:24 -04:00
Mattermod
92efe456ee Merge branch 'master' into mm-46549-gather-intent-cloud-monthly-subscription 2022-10-26 14:11:11 +03:00
Agniva De Sarker
ee3fae80bc MM-47884: Migrate config state from focalboard plugin (#21490)
Instead of blindly setting the initial flag value
to false, we set it to the original plugin setting.

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

```release-note
NONE
```
2022-10-25 23:29:16 +05:30
Agniva De Sarker
b62ee905ae MM-40690: Populate the error message with email address (#21491)
When logging via openID, if the user email is invalid,
we don't log the invalid email address. This makes
debugging difficult.

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

```release-note
NONE
```
2022-10-25 14:58:13 +05:30
emmyni
679c23d235 [MM-47560]: In-product: Add support for new fields (back-end and front-end) 2022-10-24 13:34:38 -04:00
Shota Gvinepadze
fab9d350c7 [MM-45868] Add teamId to Threads table (#20915)
* Add teamId to Threads table

* Get rid of multiple teamId reads

* Fix failed test

* Add teamId to standard queries

* Fix linter

* Get teamId from db
2022-10-24 16:10:27 +04:00
Said Atrahouch
e6b06a6dae Merge branch 'master' into mm-46549-gather-intent-cloud-monthly-subscription 2022-10-24 12:54:15 +02:00
Said Atrahouch
f9b55631fc sync new name for survey 2022-10-24 12:51:08 +02:00
Emmy Ni
eb67874cd6 Merge remote-tracking branch 'upstream/master' into MM-47560 2022-10-21 13:08:59 -04:00
Caleb Roseland
11ecd36eb2 Merge pull request #21042 from mattermost/people-product-init 2022-10-21 10:11:02 -05:00
cyrilzhang-mm
093c657e56 [MM-45052] Add error checking in insights API (#21048) 2022-10-20 14:37:24 -04:00
Pablo Andrés Vélez Vidal
c39c05e93c Replace 500 errors with more meaningful error codes (#21439)
* Replace 500 errors with more meaningful error codes

* replace forbidden with badrequest for cloud customer fetch, rename parameter name
2022-10-20 16:01:15 +02:00
Agniva De Sarker
5730d3da6e MM-47250: Add new system console section (#21333)
* MM-47250: Add new system console section

We add a new section in system console
for products.

```release-note
Added a new section in system console
for products. For now, it only contains
boards specific settings.
```

* fix unit tests

```release-note
NONE
```

* change comment

```release-note
NONE
```
2022-10-19 15:23:20 -04:00
Emmy Ni
5bf39666d7 add recurringInterval 2022-10-18 12:30:30 -04:00
Emmy Ni
58a3586279 add to UserFacingProduct 2022-10-18 11:56:23 -04:00
Said Atrahouch
b3ffec28c6 Merge pull request #21410 from mattermost/mm-46549-gather-intent-cloud-monthly-subscription
Mm 46549 gather intent cloud monthly subscription
2022-10-18 17:18:41 +02:00
Emmy Ni
ce8cfe7ffc make field not optional 2022-10-18 09:11:28 -04:00
Emmy Ni
b662eefd9f make field optional 2022-10-17 11:11:50 -04:00
Emmy Ni
00ce1a7ec7 add crossSellsTo field 2022-10-14 14:58:14 -04:00
Said Atrahouch
439048561e Fix model 2022-10-14 17:07:04 +02:00
Said Atrahouch
350b672714 [MM-46549] Allow update the cloud customer 2022-10-14 16:33:56 +02:00
Mattermod
d96516acd9 Update minor version to 7.5.0 (#21405)
Automatic Merge
2022-10-14 02:32:14 +03:00
Julien Tant
3747d99806 [MM-46694] A/B Test: welcome post (#20926)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-10-13 14:23:22 -07:00
emmyni
07f04b0349 Merge pull request #21175 from emmyni/MM-29625
MM-29625: Remove CloudBilling Feature Flag
2022-10-07 11:11:54 -04:00
Pablo Andrés Vélez Vidal
9a804a96fe MM-47228 - restrict guest invitation flow if subscription plan does n… (#21195)
* MM-47228 - restrict guest invitation flow if subscription plan does not support it

* fix i18n texts and add unit test

* test the scenario where guest invites are blocked by subscription

* cover the success scenarios for cloud free trial and paid subscription

* fix go vet

* use the cloud prefix for the sku

* fix unit tests

* check the licence value to determine if the guest accounts are enabled

* remove unnecessary changes for getting the subscription information

* restrict user demotion if guestAccounts is not available in license

Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com>
2022-10-07 15:57:44 +02:00
Vishal
6e9b808efd [MM-46644] Auto respond message (#20900)
Automatic Merge
2022-10-07 16:02:11 +03:00
Michel Engelen
203df2f537 removed feature flag for Advanced Text Editor (#21221) 2022-10-05 21:38:34 +02:00
Ben Cooke
76386df998 [MM-24461] Show last active time of users when not online (#19126)
* tools updates

* Revert "tools updates"

This reverts commit 6293297b55803c5a263e200ebd80192899666ae9.

* new config EnableLastActiveTime

Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.local>
Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MBP.ht.home>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-30 13:11:34 -04:00
Emmy Ni
e59f527f92 remove references to CloudBilling 2022-09-30 11:33:34 -04:00
cyrilzhang-mm
aee1600d49 [MM-42400] Prevent making groups with reserved names (#21040) 2022-09-29 09:23:27 -04:00
Benjamin Cooke
1f4f59aaa0 Merge remote-tracking branch 'upstream/master' into people-product-init 2022-09-28 13:20:14 -04:00
Vishal
f5f036d94b [MM-44489] Cloud limits: enforcing files (#20703)
* Update last accessible file time

* Filter fileInfos

* Set inaccessible header

* Fix lint issue

* Fix lint issue

* Fix i18n

* add nil check

* Fix merge conflicts

* Add helper functions to clear out inaccessible files content

* Remove content for inaccessible files

* Fix typo

* wip

* Remove InaccessibleContent field, instead use Archived

* Add store tests

* Add tests

* Add separate funcs to ignore cloud limits

* Use separate query for MySql

* Use GetReplicaX

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-28 12:52:53 -04:00
Orlando Romo
b9834a2fc2 [MM-42191]: Include deleted posts (#19985)
* MM-42191: Include deleted posts: Add includeDeleted query parameter for getPostsForChannel

* MM-42191: Fix error typo for includeDeleted query parameter

* MM-42191: Include deleted posts: Set permission error when deleted posts are requested by non system admins

* MM-42191: Include deleted posts: Refactor replyCountSubQuery and conditions when includeDeleted is not presented, refactor getRootPosts

* MM-42191: Include deleted posts: Refactor getRootPosts function along with skipFetchThreads and includeDeleted

* MM-42191: Include deleted posts: Rename includeDeleted to include_deleted param

* MM-42191: Include deleted posts: Fix failed posts unit tests

* MM-42191: Include deleted posts: Add missing include deleted option in multiple queries

* MM-42191: Include deleted posts: Add tests for include deleted option in TestGetPostsForChannel, TestGetPostsBefore, TestGetPostsAfter

* MM-42191: include deleted posts: Add tests cases for post store test

* MM-42191: Include deleted posts: Add extra unit test to ensure not returning deleted posts when IncludeDelete is false

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-27 14:00:42 -04:00
Caleb Roseland
3a370e1818 add PeopleProduct flag 2022-09-16 15:35:02 -05:00
Mattermod
1a5ecfa957 Update minor version to 7.4.0 (#21033)
Automatic Merge
2022-09-15 16:29:09 +03:00
Mattermod
99c9957fcf Merge branch 'master' into MM-45580-notify-admin-delinquency-update-billing 2022-09-13 14:35:21 +03:00
Said Atrahouch
fb3b2a4f47 [MM-45580] Update with the typo the map 2022-09-13 13:13:35 +02:00
Said Atrahouch
aaabf71ceb Update model/notify_admin.go
Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>
2022-09-13 13:06:04 +02:00
Christopher Poile
54df69e57a MM-46947 - Fix: Manifest parsing won't allow placeholders for custom pluginSettingType (#21004)
* allow custom pluginSettingTypes to have a placeholder

* i18n

* lock it down with a test case

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-12 14:35:33 -04:00
Said Atrahouch
10ae097589 [MM-45580] Send deliquency since to end users and allow new notify admin request 2022-09-12 17:39:17 +02:00
Kyriakos Z
93174fbe56 MM-46408: adds PostPriority feature flag and admin setting (#20875)
* MM-46408: adds PostPriority feature flag

Adds the PostPriority feature flag. You can enable it by setting the
env variable `MM_FEATUREFLAGS_POSTPRIORITY=true`.

* Adds support for admin setting

* empty

* Uses post priority in telemetry

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-11 20:45:20 +03:00
Shivashis Padhi
38aaa9e3d3 [MM-46603] P1 - Improvements in handling '0 posts' channels (#20905)
Automatic Merge
2022-09-09 20:34:00 +03:00
Doug Lauder
1d7822d154 Revert "Allow inline JSON in config.json for advanced logging config (#20954)" (#20983)
This reverts commit 5211d5de15.
2022-09-09 12:56:05 -04:00
Doug Lauder
5211d5de15 Allow inline JSON in config.json for advanced logging config (#20954)
* Allow embedded JSON in config.json for AdvancedLoggingConfig

* fix escaped JSON case

* Add unit test cases for escaped JSON

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-09 07:51:17 -04:00
Daniel Espino García
56bf9cec50 Add missing field "sortOrder" to graphQL schema (#20956)
* Add missing field "sortOrder" to graphQL schema

* Add test

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-08 09:30:53 +02:00
Agniva De Sarker
a0ab03a31e MM-46869: Fix channel props not appearing in GraphQL (#20944)
The props map was being null, but the schema did not
allow nulls. Therefore, the whole response was being
set to null. There was no error which created more
confusion.

To avoid making the property nillable, which would
mean sending pointers to maps, we just create
empty maps if they are nil.

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

```release-note
NONE
```
2022-09-07 08:38:41 +05:30