summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MM-10731 Revert site url kill server (#8877)Christopher Speller2018-05-305-31/+22
| | | | | | | | * Revert "MM-9983 Requiring SiteURL to be set. (#8769)" This reverts commit 0432f995ec27de9ee6cc2f5847d4a17fcc095a26. * Add log message for SiteURL not being set.
* Revert "MM-6839: search relative to executable (#8853)" (#8876)Christopher Speller2018-05-293-252/+44
| | | This reverts commit d3cf110620033f8831a55a3fd911d7864b6aab4a.
* MM-6839: search relative to executable (#8853)Jesse Hallam2018-05-293-44/+252
| | | | | | | | | | * 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
* fix bad merge (#8869)Carlos Tadeu Panato Junior2018-05-291-0/+1
|
* Avoid emails if user status is OOO or post is an auto response (#8842)Chris Duarte2018-05-281-1/+3
|
* [MM-10519] Send websocket event whenever the channel has changed it's type ↵Saturnino Abril2018-05-283-1/+39
| | | | | | | | | | | | | | | | | | (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>
* [MM-1915] Add Deactivate Account - server side (#8699)Carlos Tadeu Panato Junior2018-05-288-1/+118
|
* re-enabling TestSendMailUsingConfigAdvanced (#8836)Carlos Tadeu Panato Junior2018-05-272-6/+11
|
* Update CONTRIBUTING.md (#8828)Jason Blais2018-05-271-2/+2
| | | | | | * Update CONTRIBUTING.md * Fix typo
* [MM-10645] Remove desktop duration notify props (#8851)Saturnino Abril2018-05-254-29/+2
| | | | | | | | | | * 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>
* add ExperimentalHideTownSquareinLHS in config setting (#8751)Saturnino Abril2018-05-244-26/+35
|
* translations PR 20180522 (#8837)Elias Nahum2018-05-2414-118/+482
| | | | | | * translations PR 20180522 * Fix italian translation
* MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-2317-93/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* allow tuning *IdleConn* for intra-cluster messages (#8799)Jesse Hallam2018-05-232-9/+27
| | | | | | * allow tuning *IdleConn* for inter cluster messages * default MaxIdleConnsPerHost to 128
* MM-10649: soften Channels.ExtraUpdateAt deprecation (#8843)Jesse Hallam2018-05-232-0/+20
| | | | | | | | 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.
* remove license check when enforcing password requirements (#8840)Saturnino Abril2018-05-235-24/+6
| | | Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
* add EnablePreviewModeBanner in config (#8834)Saturnino Abril2018-05-224-0/+8
| | | Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
* MM-10352: Add locking incoming webhooks to a single channel. (#8835)George Goldberg2018-05-225-11/+45
|
* Change order of web endpoints (#8817)Elias Nahum2018-05-211-1/+1
|
* Skip cluster send when getting non-cached statuses (#8824)Joram Wilander2018-05-181-2/+2
|
* Fixing TE login. (#8826)Christopher Speller2018-05-181-3/+5
|
* Fixing CMD docs. (#8827)Christopher Speller2018-05-182-3/+3
|
* MM-9983 Requiring SiteURL to be set. (#8769)Christopher Speller2018-05-186-18/+33
| | | | | | | | * Requiring SiteURL to be set. * Modifying to make tests pass. * Fixing test.
* Upgrading server dependency. (#8807)Christopher Speller2018-05-18178-8816/+20199
|
* MM-10640 Set EnableUserCreation to true by default (#8815)Balasankar C2018-05-188-14/+19
| | | | | | | | | | | | | | * 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
* Add config setting for API team deletion (#8800)Joram Wilander2018-05-185-15/+24
|
* fix `make run-server` (#8819)Jesse Hallam2018-05-171-1/+2
| | | | | | | | | * 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
* Renaming platform binary to mattermost. (#8801)Christopher Speller2018-05-1741-262/+284
|
* MM-8708 Remove api package (#8784)Joram Wilander2018-05-1687-22892/+1539
| | | | | | | | | | | | | | | | | | | | | | * 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
* Update email notification subject line and contents for Group Messages (#8689)Ugurcan Turkdogan2018-05-153-56/+171
| | | | | | | | | | | 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
* MM-10249 Adding plugin ability to intercept posts before they reach the DB. ↵Christopher Speller2018-05-1513-299/+1100
| | | | | | | | (#8791) * Adding plugin ability to intercept posts before they reach the DB. * s/envoked/invoked/
* Merge branch 'merge410rc5'Derrick Anderson2018-05-1528-1648/+1190
|\
| * Merge remote-tracking branch 'origin/release-4.10' into merge410rc5Derrick Anderson2018-05-1528-1648/+1190
|/|
| * translations PR 20180511 (#8774)Elias Nahum2018-05-1414-380/+380
| | | | | | | | | | | | * translations PR 20180511 * Fix bad translations
| * Updating NOTICE.txt (#8732)amyblais2018-05-141-1234/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt
| * drop 401s from info to debug (#8778)Jesse Hallam2018-05-141-4/+8
| |
| * [MM-9720] fix bugs when trying to change for a in use email and check the ↵Carlos Tadeu Panato Junior2018-05-112-1/+17
| | | | | | | | number of parameters (#8772)
| * add notification when @user, @here, @all and @channel has colon ":" at the ↵Saturnino Abril2018-05-112-6/+59
| | | | | | | | end (#8760)
| * fix mlog-ing before initialized (#8753)Jesse Hallam2018-05-114-16/+210
| | | | | | | | | | | | | | 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.
| * More potential panic fixes (#8776)Joram Wilander2018-05-111-6/+9
| |
| * [MM-10458] Change system response to "Could not find the channel" - bug fix ↵Carlos Tadeu Panato Junior2018-05-114-1/+43
| | | | | | | | | | | | | | | | (#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
* | MM-10201: querystring for get slash commands (#8779)Jesse Hallam2018-05-142-60/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Move SAML endpoints out of api package (#8780)Joram Wilander2018-05-145-136/+159
| |
* | Refactor context out of API packages (#8755)Joram Wilander2018-05-1416-607/+704
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* | MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762)Jesse Hallam2018-05-144-81/+3
| |
* | Merge branch 'merge410rc2'Derrick Anderson2018-05-114-24/+300
|\ \
| * | add s3 test back in for masterDerrick Anderson2018-05-111-2/+2
| | |
| * | Merge release-4.10 with masterDerrick Anderson2018-05-115-26/+302
|/| | | |/
| * Comment out problematic TestS3TestConnection test (#8770)Joram Wilander2018-05-101-2/+2
| |
| * Attempt to fix hub nil panic (#8766)Joram Wilander2018-05-101-1/+1
| |