summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Include the daily and monthly active user counts in telemetry. (#8887)George Goldberg2018-06-051-6/+15
|
* Fixed invalid CustomUrlSchemes error message (#8902)Harrison Healey2018-06-051-1/+1
|
* MM-9730 & MM-9729: Missing Server PRs (#8908)George Goldberg2018-06-059-3/+312
| | | | | | * MM-9730: API endpoint to update scheme-derived roles of TeamMembers. * MM-9729: API to update scheme-derived roles of ChannelMembers.
* MM-10348 Adding experimental hardened mode. (#8881)Christopher Speller2018-06-044-7/+32
| | | | | | * Adding experimental hardened mode. * Sanitizing all 500 errors.
* Remove plugin sandbox warning message (#8897)Joram Wilander2018-06-041-6/+1
|
* [MM-10718] Move custom branding to TE (#8871)Saturnino Abril2018-06-028-59/+50
| | | | | * move custom branding to TE * move brand's enterprise code to server and remove BrandInterface
* 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
| | | | | | * MM-10757: Default roles from scheme should be keyed by name not ID. * Update permissions import/export.
* 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
| | | | | | | | | | | | * Add note about clearing caches when permissions reset CLI done. * Adjust text.
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-2916-37/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions * MM-8853: Removing unnecesary emoji enterprise feature * Create emojis migration * Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins * Simplifing permissions checks * Revert "Simplifing permissions checks" This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
| * 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 ↵Martin Kraft2018-05-251-0/+3
| |\ \ \ | | | | | | | | | | | | | | | github.com:mattermost/mattermost-server into advanced-permissions-phase-2
| | * | | 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-10264: Adds CLI command to import and export permissions. * MM-10264: Changes Scheme Name to DisplayName and adds Name slug field. * MM-10264: Changes display name max size. * MM-10264: Another merge fix. * MM-10264: Changes for more Schemes methods checking for migration. * MM-10264: More updates for Schemes migration checking.
| * | | | | | | | MM-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-175-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10606: Add new field to license for custom schemes. * Add feature flag to license check for Schemes.
| * | | | | | | | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1718-0/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings.
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10234: Make CLI roles command advanced-permissions aware. * Fix for loop scope. * Fix style.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-9728: Online migration for advanced permissions phase 2 * Add unit tests for new store functions. * Move migration specific code to own file. * Add migration state function test. * Style fixes. * Add i18n strings. * Fix mocks. * Add TestMain to migrations package tests. * Fix typo. * Fix review comments. * Fix up the "Check if migration is done" check to actually work.
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement basic scheme CRUD endpoints. * Get All Schemes (Paged) Endpoint and store plumbing. * Add get teams/channels for schemes. * Fix unit tests. * Review fixes. * More review fixes.
| * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10183: Adds channel scheme API endpoint. MM-10182: Adds team scheme API endpoint. MM-10182_3: Switch from scheme_id in path to body. * MM-10182/MM-10183: Changes path from 'schemes' to 'scheme'. * MM-10182: Fix merge error.