summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * | | | | | | | 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
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1641-2003/+2461
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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