Commit Graph

9926 Commits

Author SHA1 Message Date
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
Christopher Speller
2f6039f23f Revert "MM-6839: search relative to executable (#8853)" (#8876)
This reverts commit d3cf110620.
2018-05-29 13:21:42 -07: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
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
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
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
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
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
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
George Goldberg
8fb070fecf MM-10352: Add locking incoming webhooks to a single channel. (#8835) 2018-05-22 11:06:14 -07:00
Elias Nahum
1af1bce619 Change order of web endpoints (#8817) 2018-05-21 10:15:23 -04:00
Joram Wilander
a9d083d119 Skip cluster send when getting non-cached statuses (#8824) 2018-05-18 15:02:40 -07:00
Christopher Speller
b2ad523765 Fixing TE login. (#8826) 2018-05-18 13:07:52 -07:00
Christopher Speller
88a8703766 Fixing CMD docs. (#8827) 2018-05-18 10:34:37 -07:00
Christopher Speller
0432f995ec MM-9983 Requiring SiteURL to be set. (#8769)
* Requiring SiteURL to be set.

* Modifying to make tests pass.

* Fixing test.
2018-05-18 08:37:43 -07:00
Christopher Speller
d5e1f7e298 Upgrading server dependency. (#8807) 2018-05-18 07:32:31 -07:00
Balasankar C
d3ead7dc85 MM-10640 Set EnableUserCreation to true by default (#8815)
* Set EnableUserCreation to true by default

* Fix argument type to FormatBool

* Convert EnableUserCreation instances to pointer

* Convert to boolean in tests also

* Set value of pointer to be false

* Convert remaining EnableUserCreation instances to pointer
2018-05-18 09:57:30 -04:00
Joram Wilander
c6cbce6100 Add config setting for API team deletion (#8800) 2018-05-18 09:13:23 -04:00
Jesse Hallam
e591fcf3d8 fix make run-server (#8819)
* fix `make run-server`

The `PLATFORM_FILES` environment variable no longer gives `go run` the
necessary context to run the mattermost binary.

* clean up cmd/mattermost/cprofile*.out
2018-05-17 19:24:49 -07:00
Christopher Speller
11cbb59747 Renaming platform binary to mattermost. (#8801) 2018-05-17 12:40:40 -07:00
Joram Wilander
1f6c271b3b MM-8708 Remove api package (#8784)
* Remove api package

* Remove api dependency from cmd package

* Remove EnableAPIv3 setting

* Update web tests

* Add more websocket tests

* Move some ws and oauth tests to api4 package

* Move command tests into api4 package

* Test fixes

* Fix msg command test

* Add some app file tests
2018-05-16 13:43:22 -04:00
Ugurcan Turkdogan
02f8c18f40 Update email notification subject line and contents for Group Messages (#8689)
Reordered notification strings

MM-10335 Changed uppercase CHANNEL to Lowercase Channel, added @ sign before username on notifications

Added @ sign in front of username in all email notifications.
Capitalized Direct Message and Group Message in email notifications.
Fixed the issue with long group message names.

Removed executable bit
2018-05-15 16:43:59 -04:00
Christopher Speller
df6a7f8b19 MM-10249 Adding plugin ability to intercept posts before they reach the DB. (#8791)
* Adding plugin ability to intercept posts before they reach the DB.

* s/envoked/invoked/
2018-05-15 13:33:47 -07:00
Derrick Anderson
fbbe1f7cef Merge branch 'merge410rc5' 2018-05-15 11:54:24 -04:00
Derrick Anderson
228bc4bd1d Merge remote-tracking branch 'origin/release-4.10' into merge410rc5 2018-05-15 11:19:27 -04:00
Elias Nahum
9301e575c8 translations PR 20180511 (#8774)
* translations PR 20180511

* Fix bad translations
v4.10.0 v4.10.0-rc5 v4.10.0-rc4
2018-05-14 16:05:37 -04:00
amyblais
77718928b7 Updating NOTICE.txt (#8732)
* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt

* Update NOTICE.txt
2018-05-14 16:04:10 -04:00
Jesse Hallam
f523a21e6d drop 401s from info to debug (#8778) 2018-05-14 15:02:32 -04:00
Jesse Hallam
a1656dffa9 MM-10201: querystring for get slash commands (#8779)
* pass GET slash command payloads through query string

Previously, both GET and POST requests received the payload via the
body, but this was incorrect for GET requests. Now, the payloads for GET
requests is sent via the query string.

* reorder tests for clarity

* switch command tests to use httptest servers

* restore original test command endpoints
2018-05-14 13:24:22 -04:00
Joram Wilander
6a9aa855d1 Move SAML endpoints out of api package (#8780) 2018-05-14 11:27:30 -04:00
Joram Wilander
47250c6629 Refactor context out of API packages (#8755)
* Refactor context out of API packages

* Update function names per feedback

* Move webhook handlers to web and fix web tests

* Move more webhook tests out of api package

* Fix static handler
2018-05-14 10:24:58 -04:00
Jesse Hallam
7e7c551987 MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762) 2018-05-14 09:43:06 -04:00
Carlos Tadeu Panato Junior
527bf9d3d3 [MM-9720] fix bugs when trying to change for a in use email and check the number of parameters (#8772) v4.10.0-rc3 2018-05-11 12:58:03 -04:00
Saturnino Abril
4ce37601a1 add notification when @user, @here, @all and @channel has colon ":" at the end (#8760) 2018-05-11 12:57:20 -04:00
Jesse Hallam
b4db76cedb fix mlog-ing before initialized (#8753)
Dump mlog to STDOUT before initialized, to allow for logging failures
that occur due to config parsing, etc.

Fix file logging to honour logger.FileJson instead of copying the
logger.ConsoleJson setting.
2018-05-11 12:56:54 -04:00
Joram Wilander
91c9981563 More potential panic fixes (#8776) 2018-05-11 11:56:02 -04:00
Carlos Tadeu Panato Junior
0dbaa2d032 [MM-10458] Change system response to "Could not find the channel" - bug fix (#8738)
* [MM-10458] Change system response to "Could not find the channel" when trying to invite user to private channel you can't see

* add another check to check if user have permission to add another in pvt channel
2018-05-11 11:20:47 -04:00
Derrick Anderson
c9196af23e Merge branch 'merge410rc2' 2018-05-11 10:56:38 -04:00
Derrick Anderson
52674eb4c7 add s3 test back in for master 2018-05-11 10:44:42 -04:00
Derrick Anderson
e3ea27c301 Merge release-4.10 with master 2018-05-11 10:17:59 -04:00
Jesse Hallam
2b27e12445 MM-10188: expect io.Reader in FileBackend.WriteFile (#8765)
This is a reworked set of changes originally from @josephGuo to begin
reducing the duplicated memory required when uploading files.
2018-05-10 15:16:33 -07:00