summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Get the count of the all system users at endpoint /users/stats (#8847)lisakycho2018-06-075-20/+80
| | | | | | | | * Get the count of the all system users at endpoint /users/stats * Added GetTotalUsersStats test in api4 * Changed pluralization and added the test back.
* allow client4 http keep-alive (#8854)Jesse Hallam2018-06-071-11/+0
| | | | | | | | | | Some years ago, we explicitly disallowed keep-alive on connections initiated by the golang driver to the mattermost-server, possibly due to memory leak issues. While this path isn't used directly via a typical werver/webapp setup, it makes sense to allow keep-alive for any third-party programmatic use of the API. This commit will allow us to test `master` with the behaviour over some time to identify any potential new troubles.
* Relese5.0 merge master 20180607 (#8927)Carlos Tadeu Panato Junior2018-06-073-1/+9
| | | | | | | | | | * Add missing diagnostics (#8911) * Update diagnostics.go * Update diagnostics.go * Fix push notification styling backwards compatibility (#8913)
* MM-6839: searching for paths relative to executable (#8915)Jesse Hallam2018-06-063-45/+366
| | | | | | | | | | | | | | | | | | * 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 * add unit tests for utils.FindFile to exclude directories * fix filtering out directories in FindFile * fix platform invoking ./bin/mattermost
* use minio release instead of latest (#8917)Carlos Tadeu Panato Junior2018-06-061-1/+1
|
* disable Supervisor_PluginRepeatedlyCrash (#8918)Jesse Hallam2018-06-051-2/+2
| | | | | | | | | | | | * disable Supervisor_PluginRepeatedlyCrash This test is failing sporadically, largely due to the use of a timeout to verify results. A more robust solution is required. * disable Supervisor_PluginCrash This test is failing sporadically, largely due to the use of a timeout to verify results. A more robust solution is required.
* Uncomment upgrade for 5.0.0 (#8914)Carlos Tadeu Panato Junior2018-06-052-14/+14
|
* translations PR 20180604 (#8909)Elias Nahum2018-06-0514-643/+2723
|
* MM-10597 Improved handling of punctuation around notifications (#8901)Harrison Healey2018-06-052-14/+59
|
* Include the daily and monthly active user counts in telemetry. (#8887)George Goldberg2018-06-051-6/+15
|
* Fixed invalid CustomUrlSchemes error message (#8902)Harrison Healey2018-06-051-1/+1
|
* MM-9730 & MM-9729: Missing Server PRs (#8908)George Goldberg2018-06-059-3/+312
| | | | | | * MM-9730: API endpoint to update scheme-derived roles of TeamMembers. * MM-9729: API to update scheme-derived roles of ChannelMembers.
* MM-10348 Adding experimental hardened mode. (#8881)Christopher Speller2018-06-044-7/+32
| | | | | | * Adding experimental hardened mode. * Sanitizing all 500 errors.
* Remove plugin sandbox warning message (#8897)Joram Wilander2018-06-041-6/+1
|
* [MM-10718] Move custom branding to TE (#8871)Saturnino Abril2018-06-028-59/+50
| | | | | * move custom branding to TE * move brand's enterprise code to server and remove BrandInterface
* Adding mlog to context. (#8882)Christopher Speller2018-06-012-9/+29
|
* MM-10412: Adds deleteBy prop to posts. (#8896)Martin Kraft2018-06-018-17/+39
|
* MM-10760: Using master for any Exec call (#8895)Jesús Espino2018-06-012-3/+3
|
* MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)George Goldberg2018-06-018-73/+104
| | | | | | * MM-10757: Default roles from scheme should be keyed by name not ID. * Update permissions import/export.
* Merge branch 'advanced-permissions-phase-2'George Goldberg2018-05-3193-220/+8286
|\
| * Add note about clearing caches when permissions reset CLI done. (#8823)George Goldberg2018-05-301-1/+3
| | | | | | | | | | | | * Add note about clearing caches when permissions reset CLI done. * Adjust text.
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-2916-37/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * 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-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
| |\ \
| * \ \ 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-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
| |\ \ \ \
| * | | | | fmt fix.Martin Kraft2018-05-221-1/+1
| | | | | |
| * | | | | Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-229-12/+53
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-22199-8872/+20286
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \
| * | | | | | | | 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-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
| | | | | | | | | |
| * | | | | | | | | MM-10234: Make CLI roles command advanced-permissions aware. (#8771)George Goldberg2018-05-172-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10234: Make CLI roles command advanced-permissions aware. * Fix for loop scope. * Fix style.
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1641-2003/+2461
| |\ \ \ \ \ \ \ \ \