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

2351 Коммитов

Автор SHA1 Сообщение Дата
Mattermod
e87a2bbe19 Merge branch 'master' into MM-45118_my_top_dms 2022-08-18 20:42:32 +03:00
Tim Scheuermann
1fe750ac9b Fix vet issues in model (#20784) 2022-08-18 14:53:11 +02:00
Tim Scheuermann
e665542c91 Put wrapped errors into the detailed field on serialization (#20846) 2022-08-18 14:22:12 +02:00
Tim Scheuermann
a28a967eba MM-45991 Wrap errors (#20785) 2022-08-18 11:01:37 +02:00
Nick Misasi
09eedaf10f Add DelinquentSince to Subscription fields (#20655)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-08-16 11:11:48 -04:00
Mattermod
5ea2ca8a3a Update minor version to 7.3.0 (#20815)
Co-authored-by: Mmbot <mmbot@mattermost>
2022-08-15 16:33:58 +03:00
Shivashis Padhi
582812f1fc Merge branch 'master' of github.com:mattermost/mattermost-server into top-dms-clean 2022-08-12 17:00:55 +05:30
Martin Kraft
55b3961b98 MM-45120: Track team join times. Add API to retrieve new team members since a given time. (#20708)
* MM-45120: Starts tracking team join time. Adds API to retrieve team members who joined after a given time.

* MM-45120: Updates json casing to match model.User.
2022-08-11 10:38:52 -04:00
Shivashis Padhi
4ec3eade3b Merge branch 'master' of github.com:mattermost/mattermost-server into top-dms-clean 2022-08-10 21:00:57 +05:30
Tim Scheuermann
1738bd6e92 [MM-45991] Check and return JSON errors (#20735) 2022-08-10 10:56:58 +02:00
Tim Scheuermann
b4570afa90 Replace deprecated ioutil with io and os (#20776)
* Replace ioutil with io and os

* Replace ioutil in utils/file.go

* Minor fix to tests and excluded files

Co-authored-by: Tim Scheuermann <tim.scheuermann@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-08-09 14:25:46 +03:00
Mattermod
4fc8ef0125 Merge branch 'master' into MM-45118_my_top_dms 2022-08-05 09:56:52 +03:00
Ashish Dhama
34832e0a3f change post forwarding feature flag default value to true (#20759) 2022-08-04 11:25:35 +05:30
Allan Guwatudde
5c7ed6a1b1 fix feature flag treatment (#20753) 2022-08-02 18:09:19 +03:00
Mattermod
8a532c0b8c Merge branch 'master' into MM-45118_my_top_dms 2022-07-29 10:46:32 +03:00
Tim Scheuermann
832736da37 [MM-45990] log JSON parsing errors in API4 (#20724) 2022-07-28 17:05:03 +02:00
Pablo Andrés Vélez Vidal
0ee05ce054 MM-45713 - change 500 error to json object (#20682)
* MM-45713 - change 500 error to json object

* validate possible encoding errors and follow standards

* replace normal debugging string with true string

* use bool type instead of string

Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-07-28 15:07:54 +02:00
Shivashis Padhi
57e25b5d8f Add information on individual message count 2022-07-28 16:36:37 +05:30
Shivashis Padhi
e94532c862 SecondParticipant now has extended user object 2022-07-27 18:41:18 +05:30
Shivashis Padhi
849aea452c Merge branch 'master' of github.com:mattermost/mattermost-server into top-dms-clean 2022-07-27 17:03:34 +05:30
Tim Scheuermann
eba08cbb11 Replace ioutil.Discard with io.Discard (#20707) 2022-07-27 11:40:33 +02:00
Michael Kochell
c6913f7d9e support plugin setting property hosting (#20677)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-07-26 11:31:34 -04:00
Agniva De Sarker
20cb042362 Hackathon: Post Reminders (#20555)
This PR adds the post reminder backend work.

We add a new API endpoint via which a user can set a reminder for a post. An ephemeral message will be sent down the line to let the user know about the action. And then after the time is over, the system admin bot will send a DM message to the user about the reminder post.
2022-07-26 16:12:56 +05:30
Nathaniel Allred
77881fc357 Mm 43609 (#20657)
* return first inaccessible post time instead of has inaccessible posts
2022-07-25 16:01:59 -05:00
Allan Guwatudde
478ff50ffd [MM-45666] - A/B Test: Nav Bar Upgrade button (#20676)
* [MM-45666] - A/B Test: Nav Bar Upgrade button

* update flag default value

* update text
2022-07-25 22:22:07 +03:00
Agniva De Sarker
fa9477d332 MM-45000: Upgrade to new opengraph module path (#20701)
https://mattermost.atlassian.net/browse/MM-45000

```release-note
NONE
```
2022-07-25 14:25:32 +05:30
Michel Engelen
68055bcb10 added a feature-flag and default value for PostForwarding (#20166)
Automatic Merge
2022-07-22 13:23:14 +03:00
Claudio Costa
9255671222 [MM-45862] Set size and extension to fileinfo (#20681)
* Set size and extension to fileinfo

* Remove unnecessary check
2022-07-22 09:14:01 +02:00
Riccardo Santoni
3d7859396d [MM-42194] Get file information from a deleted post (#20279)
* Introduced inlcude_deleted query parameter to allow admins to retrieve contents of post regardless of deletion status

* Introduced new client route and tests for getting file info of deleted posts

* Fixed tests due to caching of posts

* gofmt

* Small formatting updates

* Invalidating file infos cache on delete of post if post includes files

* Including deleted in migration flow

* Moved invalidating of cache

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-07-21 11:11:08 -04:00
Michael Kochell
bc7f961d75 Store plugin OnActivate errors and include them in PluginStatus response (#20430)
* store plugin OnActivate errors, and include in PluginStatus

* write test

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-07-21 10:55:57 -04:00
Lev
dc366bc1e2 MM-45208: strip post meta for plugins (#20686)
Try two...

* Revert "Revert "Removed the opengraph type dependency for plugins by stripping post Metadata (#20612)" (#20684)"

This reverts commit 32dee6d449.

* Fixed race condition

* PR feedback

* lint
2022-07-21 07:11:18 -07:00
Shivashis Padhi
0936c891ff Add client, integration tests for top DMs 2022-07-21 18:42:15 +05:30
Shivashis Padhi
553b436d40 Test pagination of top DMs 2022-07-21 18:41:56 +05:30
Shivashis Padhi
0ab2189941 Add top DMs route and handlers 2022-07-21 18:39:03 +05:30
Agniva De Sarker
32dee6d449 Revert "Removed the opengraph type dependency for plugins by stripping post Metadata (#20612)" (#20684)
This reverts commit da7a8a4552.
2022-07-20 20:09:03 +05:30
Lev
da7a8a4552 Removed the opengraph type dependency for plugins by stripping post Metadata (#20612) 2022-07-20 04:50:56 -07:00
Allan Guwatudde
9e24191137 Revert "[MM-45684] - Self Managed: Add pricing modal + Upgrade button (#20653)" (#20673)
This reverts commit 01fce41bd7.
2022-07-19 10:34:24 +03:00
Jason Blais
0a9eda0e63 Make 'DisableBotsWhenOwnerIsDeactivated' and 'HelpLink' editable in Cloud (#20571)
Automatic Merge
2022-07-19 08:33:12 +03:00
Agniva De Sarker
b70a0f7880 MM-44542: Add timeout to S3 operations (#20648)
https://mattermost.atlassian.net/browse/MM-44542

```release-note
We add a new config setting AmazonS3RequestTimeoutMilliseconds under
FileSettings which sets a timeout for requests to AWS S3.

By default, the timeout is at 30 seconds.
```

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-07-19 10:03:24 +05:30
Allan Guwatudde
01fce41bd7 [MM-45684] - Self Managed: Add pricing modal + Upgrade button (#20653) 2022-07-18 18:46:32 +03:00
Agniva De Sarker
ae482e6214 GraphQL: Add missing fields (#20646)
Went through the model and added all missing fields.

Except user.Password/MfaSecret/AuthData and session.TeamMembers.

```release-note
NONE
```
2022-07-18 11:10:58 +05:30
Ossi Väänänen
8f44fbf89c Audit logging -- convert audit logs to use the new schema (#20526)
* Audit logging - new schema added, old schema removed.

* fix linter error by running goimports

* Address review comments

* Address review comments

* Example usage of new audit logging API for the updateUserAuth call

* fixed unit test on auditing updating user record

* Changed the `TestUpdateConfigDiffInAuditRecord` testcase---it failed, because this PR changes how the `meta` field is serialized into the audit log records.

* fix linter error

* use string constants for record keys

* new audit api calls for api4/bot

* `Auditable` interface implementations for model classes

* New audit calls for channel api

* New audit calls for channel_local

* renamed receivers for required style reasons

* New audit calls for api4/command

* renamed receiver

* New audit calls for api4/command_local

* renamed receiver

* fix unit test to reflect changes in the Auditable implementation of the user class

* new audit calls for compliance

* new audit calls for configs

* remove auditRec.addMeta from updateConfig and patchConfig

* new audit calls for config_local

* new audit calls

* new audit calls for ldap, license apis

* new audit calls

* new audit calls

* new audit calls

* new audit calls

* new audit calls

* new audit calls

* new audit calls

* new audit calls

* fix linter error

* fixed linter error

* fixed "user update" test

* Don't include all of config when audit logging config changes. Also fix unit test on TestUpdateConfigDiffInAuditRecord

* address review comments

* Added Auditable() method for UserPatch

* Fix duplicative method declaration from merge

* Fix styling and API changes issues introduced with merge

* Fix broken test

Co-authored-by: Daniel Schalla <daniel@schalla.me>
2022-07-14 13:52:46 +02:00
Mattermod
4d3bdab14c Update minor version to 7.2.0 (#20649)
Automatic Merge
2022-07-14 13:03:13 +03:00
Ossi Väänänen
0c5c74904b Audit logging - new schema (#20447)
* Audit logging - new schema added, old schema removed.

* fix linter error by running goimports

* Address review comments

* Address review comments

* Example usage of new audit logging API for the updateUserAuth call

* fixed unit test on auditing updating user record

* Changed the `TestUpdateConfigDiffInAuditRecord` testcase---it failed, because this PR changes how the `meta` field is serialized into the audit log records.

* fix linter error
2022-07-14 11:19:33 +02:00
Pablo Andrés Vélez Vidal
059ea7eb44 MM-45174 - split validate business email logic (#20581)
* MM-45174 - split validate business email logic

* remove unnecessary interface method

* check for error just after the cloud call to prevent server panic

Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-07-13 12:05:35 +02:00
Martin Kraft
1f34e8ba2e MM-44351: Creates new Custom Group Admin system role. (#20573)
* MM-44351: Creates new Custom Group Admin system role.

* MM-44351: Adds missing test mock.

* MM-44351: Adds missing mocks.
2022-07-13 09:38:07 +02:00
Jason Blais
74491f831c Make three file settings editable in Cloud System Console UI (#20525)
Automatic Merge
2022-07-13 09:03:13 +03:00
Agniva De Sarker
049e67b863 MM-45535: Batch optimize auth checks in GraphQL (#20634)
We create two new auth checks which take multiple channels
and teams. They can be used to check whenever a user needs
access to multiple entities.

These are then access in dataloaders to ease the load in the
database.

```release-note
NONE
```
2022-07-12 23:26:48 +05:30
Kennet Winter
80779852a1 [MM-44691] Adding gender neutral doctor-emoji (#20578) 2022-07-11 15:33:29 +02:00
Shivashis Padhi
20d690b412 [MM-45444] Denormalize Reactions to add ChannelId for top reactions insights query (#20572)
* Denormalize Reactions to add ChannelId for top reactions insights query

* Remove hardcoded timestamps

* Fix store, api4 tests for reactions

* Fix tests

* Fix integrity tests, allow reaction to have ChannelId populated before calling store function

* Lint fixes

* Add ChannelId field to BulkGetForPosts, Delete store handlers

* Add index to mysql migration, add not null characteristic without a separate command

* Select channelId instead of fetching post via store.GetPost, add if exists to drop column

* Make updating of Reactions conditional to support pre-migration

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-07-11 09:25:03 -04:00