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

2369 Коммитов

Автор SHA1 Сообщение Дата
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
Allan Guwatudde
bd42f0cd8c [MM-45564] - Notify Admin v2 (#20777)
* [MM-45564] - Notify Admin v2

* add dummy data

* update dummy data

* add store methods

* experiment with recurring task

* complete saving of the notification

* make improvements

* make improvements

* add store layer tests

* fix lint

* update store layer tests

* add app layer unit tests

* add store layers

* add app layer tests

* fix lint

* fix lint

* fix tests

* fix tests lint

* fix lint

* fix lint

* fix retry layer test

* add notifications manual trigger

* filter notifications based on current plan

* add test case

* temp change

* feedback impl

* fix translations

* change job scheduler

* refactor job

* fix store layer tests

* extract i18n

* fix lint

* fix translations

* fix translations

* add license statement for new file

* feedback impl-2

* fix lint

* update make file

* add intl ids

* improve

* fix lint

* feedback impl

* move code and rename files

* fix lint

* feedback impl

* add config for trigger notifications api

* fix tests

* tmp change

* undo temp changes

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-02 13:52:48 +03:00
Kyriakos Z
c11ad8995f Adds OmitConnection parameter to broadcast (#20723)
* Adds OmitConnection parameter to broadcast

Currently we have no means to omit sending a websocket event to a
specific connection id.
This is needed mainly so that the initiator won't receive an event for
the action it just initiated.
Will be used for the global drafts feature, so that we won't update
drafts through ws when a user is typing.

This commit adds OmitConnection to the Broadcast struct and to the
NewWebSocketEvent function signature.
shouldSendEvent should return false for that specific connection.

* Return early only if connection id matches the omitted

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-09-02 13:17:22 +03:00
Agniva De Sarker
c72e9131f4 MM-46577: Remove empty translation strings (#20876)
We replace the empty translation key with <untranslated>
which is ignored by the translation check tool.

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

```release-note
NONE
```
2022-08-25 19:59:16 +05:30
Nick Misasi
e8a45a8cf7 [MM-43399] Cloud Delinquency Email Sequence (#20814)
* Add DelinquentSince to Subscription fields

* Stashing, migrating

* Adding file

* Adding many email templates

* Fix templates pipeline

* Fix translations

* Fix mocks

* Many changes

* Adjust mocks

* Update i18n/en.json

Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>

* PR fixes

* Update string

* Update i18n/en.json

Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>

* Update URL's for buttons to open the delinquency modal

* Update emails from mjml

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Maria A Nunez <maria.nunez@mattermost.com>
2022-08-25 09:39:35 -04:00
Michel Engelen
e9cc35122f [MM-45935]: removed feature flag definition and default (#20714)
* removed feature flag definition and default

* removed default for feature flag
2022-08-25 11:18:16 +02:00
Shivashis Padhi
6adbcc5d05 MM-45899: Insights: least active channels (#20796)
* Add api endpoints, app layers for top inactive channels with dummy store calls

* Add store functions for top inactive channels

* Add model, store, app tests.

* Add client function and api tests

* Add participants information to TopInactiveChannel

* Translation fix

* Style fix while writing response

* Return channelmember IDs instead of profiles, query in batch avoiding inside the loop

* Make the following changes

 - move DeleteAt to subqueries, to avoid select, group by
 - Remove TeamId from response
 - Count bots and webhook posts

* SQL query lint fix, store test fix to include bot messages

* make app-layers

* Fix empty participant lists being sent as [""]

* Track channel joins, to distinguish 0 activity channels vs new channels

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-08-24 23:14:56 +05:30
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