summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-16 12:24:32 +0000