summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MM-10791: Don't try and generate thumbnails for non-images/svgs. (#8937)George Goldberg2018-06-121-4/+6
* Relese5.0 merge master 20180611 (#8939)Carlos Tadeu Panato Junior2018-06-112-4/+12
* MM-10684: Show logs on Slack Import CLI. (#8936)George Goldberg2018-06-111-1/+10
* MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938)George Goldberg2018-06-112-26/+10
* Skip notifications for expired sessions (#8934)Daniel Schalla2018-06-081-0/+5
* Relese5.0 merge master 20180608 (#8933)Carlos Tadeu Panato Junior2018-06-086-89/+195
* Get the count of the all system users at endpoint /users/stats (#8847)lisakycho2018-06-075-20/+80
* allow client4 http keep-alive (#8854)Jesse Hallam2018-06-071-11/+0
* Relese5.0 merge master 20180607 (#8927)Carlos Tadeu Panato Junior2018-06-073-1/+9
* MM-6839: searching for paths relative to executable (#8915)Jesse Hallam2018-06-063-45/+366
* 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
* 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-10348 Adding experimental hardened mode. (#8881)Christopher Speller2018-06-044-7/+32
* 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
* 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
* 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
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-2916-37/+427
| * 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 github.com:mattermost/mattermo...Martin Kraft2018-05-251-0/+3
| |\ \ \
| | * | | 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-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-175-15/+32
| * | | | | | | | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1718-0/+281