summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow to update the teams scheme to default scheme (#8855)Jesús Espino2018-05-292-10/+16
|
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-2811-2/+157
|\
| * [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
| |
* | MM-8814: Remove implicit permission grants from post ownership. (#8391)George Goldberg2018-05-282-19/+35
| |
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-283-8/+13
|\|
| * 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
* | Merge branch 'advanced-permissions-phase-2' of ↵Martin Kraft2018-05-251-0/+3
|\ \ | | | | | | | | | github.com:mattermost/mattermost-server into advanced-permissions-phase-2
| * | Add autogenerate scheme.name for new schemes without explicit name (#8848)Jesús Espino2018-05-251-0/+3
| | |
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-258-55/+37
|\ \ \ | |/ / |/| / | |/
| * [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
| |
* | MM-10402: Adds RunJobs to client config API. (#8846)Martin Kraft2018-05-241-0/+2
| |
* | Merge fixes.Martin Kraft2018-05-241-0/+5
| |
* | Merge fix.Martin Kraft2018-05-241-14/+15
| |
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-2439-259/+1064
|\|
| * 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>
* | fmt fix.Martin Kraft2018-05-221-1/+1
| |
* | Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-229-12/+53
|\|
| * 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
| |
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-22199-8872/+20286
|\|
| * 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
| |
* | Refactors migrations check. (#8814)Martin Kraft2018-05-215-89/+39
| |
* | Merge fix.Martin Kraft2018-05-181-0/+0
| |
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1841-264/+288
|\|
| * 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
| |
* | Reinstate upgrade code that mysteriously vanished during some merge.George Goldberg2018-05-181-1/+14
| |
* | Fix tests.George Goldberg2018-05-183-0/+4
| |
* | MM-10264: Adds CLI command to import and export permissions. (#8787)Martin Kraft2018-05-1714-14/+670
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10264: Adds CLI command to import and export permissions. * MM-10264: Changes Scheme Name to DisplayName and adds Name slug field. * MM-10264: Changes display name max size. * MM-10264: Another merge fix. * MM-10264: Changes for more Schemes methods checking for migration. * MM-10264: More updates for Schemes migration checking.
* | MM-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-175-15/+32
| | | | | | | | | | | | * MM-10606: Add new field to license for custom schemes. * Add feature flag to license check for Schemes.
* | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1718-0/+281
| | | | | | | | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings.
* | Merge error fix.Martin Kraft2018-05-171-522/+0
| |
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1786-22384/+1539
|\|
| * 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
* | MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811)George Goldberg2018-05-174-61/+34
| |
* | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)George Goldberg2018-05-173-32/+63
| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 14:31:59 +0000