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

9989 Коммитов

Автор SHA1 Сообщение Дата
Carlos Tadeu Panato Junior
bfba142e2b Uncomment upgrade for 5.0.0 (#8914) 2018-06-05 20:17:53 +02:00
Elias Nahum
3bae2f3b37 translations PR 20180604 (#8909) 2018-06-05 19:57:40 +02:00
Harrison Healey
bca7339e4c MM-10597 Improved handling of punctuation around notifications (#8901) 2018-06-05 19:34:21 +02:00
George Goldberg
5e36cbae09 Include the daily and monthly active user counts in telemetry. (#8887) 2018-06-05 19:19:20 +02:00
Harrison Healey
fb00ce951e Fixed invalid CustomUrlSchemes error message (#8902) 2018-06-05 19:18:59 +02:00
George Goldberg
0c4078b6b0 MM-9730 & MM-9729: Missing Server PRs (#8908)
* MM-9730: API endpoint to update scheme-derived roles of TeamMembers.

* MM-9729: API to update scheme-derived roles of ChannelMembers.
2018-06-05 07:41:03 -04:00
Christopher Speller
2c75247c97 MM-10348 Adding experimental hardened mode. (#8881)
* Adding experimental hardened mode.

* Sanitizing all 500 errors.
2018-06-04 09:48:26 -07:00
Joram Wilander
bd7c9f8642 Remove plugin sandbox warning message (#8897) 2018-06-04 12:34:47 -04:00
Saturnino Abril
312edbe531 [MM-10718] Move custom branding to TE (#8871)
* move custom branding to TE
* move brand's enterprise code to server and remove BrandInterface
2018-06-02 06:33:59 +08:00
Christopher Speller
ebdceb8e52 Adding mlog to context. (#8882) 2018-06-01 13:07:56 -07:00
Martin Kraft
260d7a0f85 MM-10412: Adds deleteBy prop to posts. (#8896) 2018-06-01 12:45:46 -04:00
Jesús Espino
5992a729c5 MM-10760: Using master for any Exec call (#8895) 2018-06-01 14:11:22 +01:00
George Goldberg
516a097e1a MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)
* MM-10757: Default roles from scheme should be keyed by name not ID.

* Update permissions import/export.
2018-06-01 12:49:02 +01:00
George Goldberg
27e7841a73 Merge branch 'advanced-permissions-phase-2' 2018-05-31 10:25:31 +01:00
Elias Nahum
e39f5f46f3 Push notification styling improvements (#8818)
* Push notification styling improvements

* Fix unit tests
2018-05-30 10:11:19 -07:00
Harrison Healey
2fe8878749 MM-9547 Added config setting to control url autolinking schemes (#8862)
* MM-9547 Added config setting to control autolinking schemes

* Renamed AutolinkingSchemes to CustomUrlSchemes
2018-05-30 10:48:04 -04:00
Elias Nahum
81852ab191 Changelog link (#8805) 2018-05-30 10:23:25 -04:00
Elias Nahum
009f72f075 translations PR 20180528 (#8864) 2018-05-30 10:22:37 -04:00
Christopher Speller
af4e907f5e MM-10731 Revert site url kill server (#8877)
* Revert "MM-9983 Requiring SiteURL to be set. (#8769)"

This reverts commit 0432f995ec.

* Add log message for SiteURL not being set.
2018-05-30 09:58:24 -04:00
George Goldberg
994ccf475f Add note about clearing caches when permissions reset CLI done. (#8823)
* Add note about clearing caches when permissions reset CLI done.

* Adjust text.
2018-05-30 11:21:36 +01:00
Christopher Speller
2f6039f23f Revert "MM-6839: search relative to executable (#8853)" (#8876)
This reverts commit d3cf110620.
2018-05-29 13:21:42 -07:00
Jesús Espino
e88fe4bb1d MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions

* MM-8853: Removing unnecesary emoji enterprise feature

* Create emojis migration

* Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins

* Simplifing permissions checks

* Revert "Simplifing permissions checks"

This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
2018-05-29 15:58:12 +01:00
Jesse Hallam
d3cf110620 MM-6839: search relative to executable (#8853)
* MM-6839: searching for paths relative to executable

In addition to searching relative to the current working directory, also
search relative to the location of the binary. This helps locate config
and i18n files when invoking an absolute path to the mattermost binary.

* MM-6839: find mattermost/ binary using utils.FindFile
2018-05-29 10:55:49 -04:00
Carlos Tadeu Panato Junior
4f5fdb6f89 fix bad merge (#8869) 2018-05-29 14:00:46 +02:00
Jesús Espino
bf4cefc349 Allow to update the teams scheme to default scheme (#8855) 2018-05-29 09:32:07 +01:00
Chris Duarte
792dae23ca Avoid emails if user status is OOO or post is an auto response (#8842) 2018-05-28 19:49:28 +02:00
Martin Kraft
c180cdbd1c Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-28 10:35:27 -04:00
Saturnino Abril
c37d153ffb [MM-10519] Send websocket event whenever the channel has changed it's type (public|private) (#8798)
* send websocket event whenever the channel has changed it's type (public|private)

* updated per comment

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>

* add channel_converted websocket event

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>

* only send channel_id via websocket message for "channel_converted" event

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
2018-05-28 22:31:08 +08:00
Carlos Tadeu Panato Junior
c3e9c41440 [MM-1915] Add Deactivate Account - server side (#8699) 2018-05-28 16:20:08 +02:00
George Goldberg
7225abddee MM-8814: Remove implicit permission grants from post ownership. (#8391) 2018-05-28 09:46:52 -04:00
Martin Kraft
be177caf5f Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-28 08:20:12 -04:00
Carlos Tadeu Panato Junior
b6d5cc4f69 re-enabling TestSendMailUsingConfigAdvanced (#8836) 2018-05-27 09:56:44 -04:00
Jason Blais
05460ac3a7 Update CONTRIBUTING.md (#8828)
* Update CONTRIBUTING.md

* Fix typo
2018-05-27 09:55:37 -04:00
Martin Kraft
123f33d05c Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermost-server into advanced-permissions-phase-2 2018-05-25 11:30:16 -04:00
Martin Kraft
baf697e348 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-25 11:25:40 -04:00
Jesús Espino
f1cd33c822 Add autogenerate scheme.name for new schemes without explicit name (#8848) 2018-05-25 11:24:29 -04:00
Saturnino Abril
58abb4204e [MM-10645] Remove desktop duration notify props (#8851)
* remove desktop duration notify props

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>

* fix test

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
2018-05-25 07:52:17 -07:00
Saturnino Abril
94b2eca2d1 add ExperimentalHideTownSquareinLHS in config setting (#8751) 2018-05-24 16:41:30 -04:00
Martin Kraft
a51b2367a3 MM-10402: Adds RunJobs to client config API. (#8846) 2018-05-24 16:22:54 +02:00
Martin Kraft
5f654079c0 Merge fixes. 2018-05-24 09:29:35 -04:00
Martin Kraft
ac0d656f82 Merge fix. 2018-05-24 09:13:54 -04:00
Martin Kraft
69304fb54d Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-24 08:40:52 -04:00
Elias Nahum
47f3c064db translations PR 20180522 (#8837)
* translations PR 20180522

* Fix italian translation
2018-05-24 08:25:52 -04:00
Jesse Hallam
847c181ec9 MM-8622: Improved plugin error reporting (#8737)
* allow `Wait()`ing on the supervisor

In the event the plugin supervisor shuts down a plugin for crashing too
many times, the new `Wait()` interface allows the `ActivatePlugin` to
accept a callback function to trigger when `supervisor.Wait()` returns.
If the supervisor shuts down normally, this callback is invoked with
a nil error, otherwise any error reported by the supervisor is passed
along.

* improve plugin activation/deactivation logic

Avoid triggering activation of previously failed-to-start plugins just
becase something in the configuration changed. Now, intelligently
compare the global enable bit as well as the each individual plugin's
enabled bit.

* expose store to manipulate PluginStatuses

* expose API to fetch plugin statuses

* keep track of whether or not plugin sandboxing is supported

* transition plugin statuses

* restore error on plugin activation if already active

* don't initialize test plugins until successfully loaded

* emit websocket events when plugin statuses change

* skip pruning if already initialized

* MM-8622: maintain plugin statuses in memory

Switch away from persisting plugin statuses to the database, and
maintain in memory instead. This will be followed by a cluster interface
to query the in-memory status of plugin statuses from all cluster nodes.

At the same time, rename `cluster_discovery_id` on the `PluginStatus`
model object to `cluster_id`.

* MM-8622: aggregate plugin statuses across cluster

* fetch cluster plugin statuses when emitting websocket notification

* address unit test fixes after rebasing

* relax (poor) racey unit test re: supervisor.Wait()

* make store-mocks
2018-05-23 14:26:35 -04:00
Jesse Hallam
5c21bdc178 allow tuning *IdleConn* for intra-cluster messages (#8799)
* allow tuning *IdleConn* for inter cluster messages

* default MaxIdleConnsPerHost to 128
2018-05-23 13:17:08 -04:00
Jesse Hallam
0a666a5656 MM-10649: soften Channels.ExtraUpdateAt deprecation (#8843)
The previous complete removal of this field resulted in an
incompatibility with 4.x servers that could not handle the now null
column field.

Instead, ensure this field is at least always set to 0, with a plan to
remove it altogether in a future release.
2018-05-23 10:28:19 -04:00
Saturnino Abril
70a118c0fd remove license check when enforcing password requirements (#8840)
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
2018-05-23 20:36:20 +08:00
Martin Kraft
e46b94fa66 fmt fix. 2018-05-22 16:22:20 -04:00
Martin Kraft
f40666f9e8 Merge branch 'master' into advanced-permissions-phase-2 2018-05-22 14:15:54 -04:00
Saturnino Abril
ce378adc97 add EnablePreviewModeBanner in config (#8834)
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
2018-05-22 11:10:27 -07:00