Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-16 | 41 | -2003/+2461 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix build failure from bad merge. | George Goldberg | 2018-05-16 | 1 | -4/+0 | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-15 | 29 | -902/+1300 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | MM-9728: Online migration for advanced permissions phase 2 (#8744) | George Goldberg | 2018-05-14 | 28 | -4/+1586 | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-11 | 55 | -213/+289 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into advanced-permissions-phase-2 | George Goldberg | 2018-05-10 | 2 | -2/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-09 | 20 | -98/+214 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | MM-10140: API Implementation for Schemes related Endpoints (#8615) | George Goldberg | 2018-05-03 | 22 | -5/+1303 | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-02 | 87 | -2595/+4677 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680) | Martin Kraft | 2018-05-02 | 11 | -0/+370 | |
| * | | | | | | | | | | | | | | | Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermo... | Martin Kraft | 2018-05-01 | 3 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Fixing structured logging conflicts. | Christopher Speller | 2018-04-27 | 2 | -4/+4 | |
| | * | | | | | | | | | | | | | | | Merge branch 'master' into advanced-permissions-phase-2 | Christopher Speller | 2018-04-27 | 206 | -2489/+9496 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-01 | 261 | -3075/+168113 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into advanced-permissions-phase-2 | George Goldberg | 2018-04-27 | 14 | -111/+524 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-04-24 | 5 | -47/+99 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357) | George Goldberg | 2018-04-20 | 48 | -175/+3604 | |
* | | | | | | | | | | | | | | | | | | | | Push notification styling improvements (#8818) | Elias Nahum | 2018-05-30 | 3 | -155/+305 | |
* | | | | | | | | | | | | | | | | | | | | MM-9547 Added config setting to control url autolinking schemes (#8862) | Harrison Healey | 2018-05-30 | 5 | -0/+120 | |
* | | | | | | | | | | | | | | | | | | | | Changelog link (#8805) | Elias Nahum | 2018-05-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | translations PR 20180528 (#8864) | Elias Nahum | 2018-05-30 | 14 | -94/+562 | |
* | | | | | | | | | | | | | | | | | | | | MM-10731 Revert site url kill server (#8877) | Christopher Speller | 2018-05-30 | 5 | -31/+22 | |
* | | | | | | | | | | | | | | | | | | | | Revert "MM-6839: search relative to executable (#8853)" (#8876) | Christopher Speller | 2018-05-29 | 3 | -252/+44 | |
* | | | | | | | | | | | | | | | | | | | | MM-6839: search relative to executable (#8853) | Jesse Hallam | 2018-05-29 | 3 | -44/+252 | |
* | | | | | | | | | | | | | | | | | | | | fix bad merge (#8869) | Carlos Tadeu Panato Junior | 2018-05-29 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | Avoid emails if user status is OOO or post is an auto response (#8842) | Chris Duarte | 2018-05-28 | 1 | -1/+3 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | [MM-10519] Send websocket event whenever the channel has changed it's type (p... | Saturnino Abril | 2018-05-28 | 3 | -1/+39 | |
* | | | | | | | | | | | | | | | | | | | [MM-1915] Add Deactivate Account - server side (#8699) | Carlos Tadeu Panato Junior | 2018-05-28 | 8 | -1/+118 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | re-enabling TestSendMailUsingConfigAdvanced (#8836) | Carlos Tadeu Panato Junior | 2018-05-27 | 2 | -6/+11 | |
* | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md (#8828) | Jason Blais | 2018-05-27 | 1 | -2/+2 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | [MM-10645] Remove desktop duration notify props (#8851) | Saturnino Abril | 2018-05-25 | 4 | -29/+2 | |
* | | | | | | | | | | | | | | | | | add ExperimentalHideTownSquareinLHS in config setting (#8751) | Saturnino Abril | 2018-05-24 | 4 | -26/+35 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | translations PR 20180522 (#8837) | Elias Nahum | 2018-05-24 | 14 | -118/+482 | |
* | | | | | | | | | | | | | | | | MM-8622: Improved plugin error reporting (#8737) | Jesse Hallam | 2018-05-23 | 17 | -93/+516 | |
* | | | | | | | | | | | | | | | | allow tuning *IdleConn* for intra-cluster messages (#8799) | Jesse Hallam | 2018-05-23 | 2 | -9/+27 | |
* | | | | | | | | | | | | | | | | MM-10649: soften Channels.ExtraUpdateAt deprecation (#8843) | Jesse Hallam | 2018-05-23 | 2 | -0/+20 | |
* | | | | | | | | | | | | | | | | remove license check when enforcing password requirements (#8840) | Saturnino Abril | 2018-05-23 | 5 | -24/+6 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | add EnablePreviewModeBanner in config (#8834) | Saturnino Abril | 2018-05-22 | 4 | -0/+8 | |
* | | | | | | | | | | | | | | | MM-10352: Add locking incoming webhooks to a single channel. (#8835) | George Goldberg | 2018-05-22 | 5 | -11/+45 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Change order of web endpoints (#8817) | Elias Nahum | 2018-05-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Skip cluster send when getting non-cached statuses (#8824) | Joram Wilander | 2018-05-18 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Fixing TE login. (#8826) | Christopher Speller | 2018-05-18 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | Fixing CMD docs. (#8827) | Christopher Speller | 2018-05-18 | 2 | -3/+3 | |
* | | | | | | | | | | | | | | MM-9983 Requiring SiteURL to be set. (#8769) | Christopher Speller | 2018-05-18 | 6 | -18/+33 | |
* | | | | | | | | | | | | | | Upgrading server dependency. (#8807) | Christopher Speller | 2018-05-18 | 178 | -8816/+20199 | |
* | | | | | | | | | | | | | | MM-10640 Set EnableUserCreation to true by default (#8815) | Balasankar C | 2018-05-18 | 8 | -14/+19 | |
* | | | | | | | | | | | | | | Add config setting for API team deletion (#8800) | Joram Wilander | 2018-05-18 | 5 | -15/+24 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | fix `make run-server` (#8819) | Jesse Hallam | 2018-05-17 | 1 | -1/+2 | |
* | | | | | | | | | | | | | Renaming platform binary to mattermost. (#8801) | Christopher Speller | 2018-05-17 | 41 | -262/+284 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | MM-8708 Remove api package (#8784) | Joram Wilander | 2018-05-16 | 87 | -22892/+1539 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |