summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * MM-10188: expect io.Reader in FileBackend.WriteFile (#8765)Jesse Hallam2018-05-1010-51/+95
| * Add Ping Timeout Signal for WebSocket Client (#8666)Daniel Schalla2018-05-101-10/+45
| * MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ...Christopher Speller2018-05-1045-152/+149
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-05-102-2/+7
|\|
| * fix test and add new (#8759)Carlos Tadeu Panato Junior2018-05-101-0/+12
| * Removing bad test.Christopher Speller2018-05-091-7/+0
| * Fixes incorrect MiB size. (#8750)Martin Kraft2018-05-091-1/+1
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0920-98/+214
|\|
| * prep code for 5.0 (#8743)Derrick Anderson2018-05-081-0/+9
| * Fix empty GOPATH behaviour in Makefile (#8724)Jonathan Villemaire-Krajden2018-05-071-5/+5
| * Add IncrementClusterEventType function to metrics interface (#8728)Joram Wilander2018-05-041-0/+1
| * Uncomment upgrade for 4.10 (#8727)Derrick Anderson2018-05-042-8/+8
| * Added missing i18n strings for files and email batching (#8700)Harrison Healey2018-05-042-17/+44
| * MM-10319: Use normalized email for Saml (migration) (#8711)Jesús Espino2018-05-041-0/+1
| * update permission of converting a channel from public to private to allow tea...Saturnino Abril2018-05-052-9/+11
| * Removes .vscode dir. (#8721)Martin Kraft2018-05-041-18/+0
| * respect image orientation before saving height and width of FileInfo (#8710)Saturnino Abril2018-05-041-0/+8
| * MM-10393: Fix for tracking active vs inactive users. (#8706)Martin Kraft2018-05-031-12/+12
| * MM-10189 Fixed inconsistency when using environment variables for MessageExpo...Harrison Healey2018-05-032-2/+35
| * Fix TestSendNotifications test (#8712)Jesús Espino2018-05-032-1/+10
| * MM-10424: Migrate PostEditTimeLimit config setting. (#8702)George Goldberg2018-05-022-0/+36
| * Add inactive user count to analytics and fix client analytics function (#8695)Joram Wilander2018-05-023-7/+30
| * [MM-10415] Reorder checks for command invite (#8701)Carlos Tadeu Panato Junior2018-05-021-9/+7
* | 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
|\|
| * Update zoom plugin to 0.1.6 (#8698)Joram Wilander2018-05-013-6/+6
| * MM-8622: improved plugin error handling (#8692)Jesse Hallam2018-05-0115-57/+256
| * translations PR 20180430 (#8696)Elias Nahum2018-05-0114-128/+180
| * Upgrading minio-go library to 6.0.0 (#8651)Jesús Espino2018-04-3054-2189/+4117
| * Revert "MM-9770: rewrite getParentsPosts to improve performance (#8467)" (#86...Derrick Anderson2018-04-302-215/+118
* | 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
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | MM-9072/MM-10185 Force-convert the encoding of OpenGraph metadata to UTF-8 (#...Hyeseong Kim2018-04-3038-2/+157135
| * | Add stdlog interpreter. (#8691)Christopher Speller2018-04-303-1/+117
| * | Add missing diagnostics for 4.10 (#8675)Jason Blais2018-04-301-0/+1
| * | translations PR 20180424 (#8662)Elias Nahum2018-04-3014-529/+1205
| * | [MM-10354] Add feature to remove team icon (#8684)Saturnino Abril2018-04-306-55/+148
| |/
| * Fixing some merge conflicts with structured logging. (#8685)Christopher Speller2018-04-272-10/+2
| * Structured logging (#8673)Christopher Speller2018-04-27205-2487/+9479
| * MM-10375 Fixing connected socket count (#8682)Corey Hulen2018-04-272-0/+23
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-2714-111/+524
|\|
| * modestly extend SQLite support (#8677)Jesse Hallam2018-04-271-0/+31
| * MM-10232, MM-10259: Improve error handling from invalid json (#8668)Jesse Hallam2018-04-2612-109/+487
| * Update ISSUE_TEMPLATE.md (#8292)james-mm2018-04-251-2/+6
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-04-245-47/+99
|\|