summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Fix build failure from bad merge.George Goldberg2018-05-161-4/+0
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1529-902/+1300
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-1428-4/+1586
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1155-213/+289
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-05-102-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0920-98/+214
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-0322-5/+1303
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0287-2595/+4677
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)Martin Kraft2018-05-0211-0/+370
| * | | | | | | | | | | | | | | Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermo...Martin Kraft2018-05-013-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixing structured logging conflicts.Christopher Speller2018-04-272-4/+4
| | * | | | | | | | | | | | | | | Merge branch 'master' into advanced-permissions-phase-2Christopher Speller2018-04-27206-2489/+9496
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-01261-3075/+168113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-2714-111/+524
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-04-245-47/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-2048-175/+3604
* | | | | | | | | | | | | | | | | | | | Push notification styling improvements (#8818)Elias Nahum2018-05-303-155/+305
* | | | | | | | | | | | | | | | | | | | MM-9547 Added config setting to control url autolinking schemes (#8862)Harrison Healey2018-05-305-0/+120
* | | | | | | | | | | | | | | | | | | | Changelog link (#8805)Elias Nahum2018-05-301-1/+1
* | | | | | | | | | | | | | | | | | | | translations PR 20180528 (#8864)Elias Nahum2018-05-3014-94/+562
* | | | | | | | | | | | | | | | | | | | MM-10731 Revert site url kill server (#8877)Christopher Speller2018-05-305-31/+22
* | | | | | | | | | | | | | | | | | | | Revert "MM-6839: search relative to executable (#8853)" (#8876)Christopher Speller2018-05-293-252/+44
* | | | | | | | | | | | | | | | | | | | MM-6839: search relative to executable (#8853)Jesse Hallam2018-05-293-44/+252
* | | | | | | | | | | | | | | | | | | | 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 (p...Saturnino Abril2018-05-283-1/+39
* | | | | | | | | | | | | | | | | | | [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
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | [MM-10645] Remove desktop duration notify props (#8851)Saturnino Abril2018-05-254-29/+2
* | | | | | | | | | | | | | | | | add ExperimentalHideTownSquareinLHS in config setting (#8751)Saturnino Abril2018-05-244-26/+35
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | translations PR 20180522 (#8837)Elias Nahum2018-05-2414-118/+482
* | | | | | | | | | | | | | | | MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-2317-93/+516
* | | | | | | | | | | | | | | | allow tuning *IdleConn* for intra-cluster messages (#8799)Jesse Hallam2018-05-232-9/+27
* | | | | | | | | | | | | | | | MM-10649: soften Channels.ExtraUpdateAt deprecation (#8843)Jesse Hallam2018-05-232-0/+20
* | | | | | | | | | | | | | | | remove license check when enforcing password requirements (#8840)Saturnino Abril2018-05-235-24/+6
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | add EnablePreviewModeBanner in config (#8834)Saturnino Abril2018-05-224-0/+8
* | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Renaming platform binary to mattermost. (#8801)Christopher Speller2018-05-1741-262/+284
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | MM-8708 Remove api package (#8784)Joram Wilander2018-05-1687-22892/+1539
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Update email notification subject line and contents for Group Messages (#8689)Ugurcan Turkdogan2018-05-153-56/+171