Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | translations PR 20180613 (#8947) | Elias Nahum | 2018-06-14 | 7 | -345/+345 |
| | |||||
* | Fix idempotency of scheme migrations. (#8935) | George Goldberg | 2018-06-11 | 2 | -4/+12 |
| | | | | | | | | | This fixes the issue where if the migration tries to migrate an already scheme-aware member object it would end up removing it's scheme-derived roles. Instead, only if the member object is unmigrated do we default to setting the scheme-derived role booleans to false. We tell if it is an unmigrated member object by checking if the booleans are set to null. | ||||
* | MM-10264: Adds system scheme to permissions import/export. (#8924) | Martin Kraft | 2018-06-08 | 2 | -4/+55 |
| | | | | | | | | | | | | * MM-10264: Adds system scheme to permissions import/export. * MM-10264: Switches to more likely unique name. * MM-10264: Changed collision prevention string. * MM-10264: Rolls back created schemes in all error cases. * MM-10264: Test fix for more rollback cases. | ||||
* | MM-10803: remove premature user sanitization on deactivation (#8926) | Jesse Hallam | 2018-06-07 | 4 | -85/+140 |
| | | | | | | | | | | | * remove unused UpdateNonSSOUserActive * MM-10803: stop prematurely sanitizing users on deactivate This change was preceded by the removal of UpdateNonSSOUserActive to ensure there are no APIs relying on the sanitized return value. * MM-10803: test websocket events after UpdateUserActive | ||||
* | Fix push notification styling backwards compatibility (#8913) | Elias Nahum | 2018-06-06 | 2 | -0/+3 |
| | |||||
* | Add missing diagnostics (#8911) | Jason Blais | 2018-06-06 | 1 | -1/+6 |
| | | | | | | * Update diagnostics.go * Update diagnostics.go | ||||
* | disable Supervisor_PluginRepeatedlyCrash (#8918) | Jesse Hallam | 2018-06-05 | 1 | -2/+2 |
| | | | | | | | | | | | | * disable Supervisor_PluginRepeatedlyCrash This test is failing sporadically, largely due to the use of a timeout to verify results. A more robust solution is required. * disable Supervisor_PluginCrash This test is failing sporadically, largely due to the use of a timeout to verify results. A more robust solution is required. | ||||
* | Uncomment upgrade for 5.0.0 (#8914) | Carlos Tadeu Panato Junior | 2018-06-05 | 2 | -14/+14 |
| | |||||
* | translations PR 20180604 (#8909) | Elias Nahum | 2018-06-05 | 14 | -643/+2723 |
| | |||||
* | MM-10597 Improved handling of punctuation around notifications (#8901) | Harrison Healey | 2018-06-05 | 2 | -14/+59 |
| | |||||
* | Include the daily and monthly active user counts in telemetry. (#8887) | George Goldberg | 2018-06-05 | 1 | -6/+15 |
| | |||||
* | Fixed invalid CustomUrlSchemes error message (#8902) | Harrison Healey | 2018-06-05 | 1 | -1/+1 |
| | |||||
* | MM-9730 & MM-9729: Missing Server PRs (#8908) | George Goldberg | 2018-06-05 | 9 | -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 Speller | 2018-06-04 | 4 | -7/+32 |
| | | | | | | * Adding experimental hardened mode. * Sanitizing all 500 errors. | ||||
* | Remove plugin sandbox warning message (#8897) | Joram Wilander | 2018-06-04 | 1 | -6/+1 |
| | |||||
* | [MM-10718] Move custom branding to TE (#8871) | Saturnino Abril | 2018-06-02 | 8 | -59/+50 |
| | | | | | * move custom branding to TE * move brand's enterprise code to server and remove BrandInterface | ||||
* | Adding mlog to context. (#8882) | Christopher Speller | 2018-06-01 | 2 | -9/+29 |
| | |||||
* | MM-10412: Adds deleteBy prop to posts. (#8896) | Martin Kraft | 2018-06-01 | 8 | -17/+39 |
| | |||||
* | MM-10760: Using master for any Exec call (#8895) | Jesús Espino | 2018-06-01 | 2 | -3/+3 |
| | |||||
* | MM-10757: Default roles from scheme should be keyed by name not ID. (#8894) | George Goldberg | 2018-06-01 | 8 | -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 Goldberg | 2018-05-31 | 93 | -220/+8286 |
|\ | |||||
| * | Add note about clearing caches when permissions reset CLI done. (#8823) | George Goldberg | 2018-05-30 | 1 | -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 Espino | 2018-05-29 | 16 | -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 Espino | 2018-05-29 | 2 | -10/+16 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-28 | 11 | -2/+157 |
| |\ | |||||
| * | | MM-8814: Remove implicit permission grants from post ownership. (#8391) | George Goldberg | 2018-05-28 | 2 | -19/+35 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-28 | 3 | -8/+13 |
| |\ \ | |||||
| * \ \ | Merge branch 'advanced-permissions-phase-2' of ↵ | Martin Kraft | 2018-05-25 | 1 | -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 Espino | 2018-05-25 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-25 | 8 | -55/+37 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | MM-10402: Adds RunJobs to client config API. (#8846) | Martin Kraft | 2018-05-24 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge fixes. | Martin Kraft | 2018-05-24 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Merge fix. | Martin Kraft | 2018-05-24 | 1 | -14/+15 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-24 | 39 | -259/+1064 |
| |\ \ \ \ | |||||
| * | | | | | fmt fix. | Martin Kraft | 2018-05-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-22 | 9 | -12/+53 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-22 | 199 | -8872/+20286 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Refactors migrations check. (#8814) | Martin Kraft | 2018-05-21 | 5 | -89/+39 |
| | | | | | | | | |||||
| * | | | | | | | Merge fix. | Martin Kraft | 2018-05-18 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-18 | 41 | -264/+288 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Reinstate upgrade code that mysteriously vanished during some merge. | George Goldberg | 2018-05-18 | 1 | -1/+14 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix tests. | George Goldberg | 2018-05-18 | 3 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | MM-10264: Adds CLI command to import and export permissions. (#8787) | Martin Kraft | 2018-05-17 | 14 | -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 Goldberg | 2018-05-17 | 5 | -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 Goldberg | 2018-05-17 | 18 | -0/+281 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings. | ||||
| * | | | | | | | | Merge error fix. | Martin Kraft | 2018-05-17 | 1 | -522/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-17 | 86 | -22384/+1539 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811) | George Goldberg | 2018-05-17 | 4 | -61/+34 |
| | | | | | | | | | | |||||
| * | | | | | | | | | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812) | George Goldberg | 2018-05-17 | 3 | -32/+63 |
| | | | | | | | | | | |||||
| * | | | | | | | | | MM-10234: Make CLI roles command advanced-permissions aware. (#8771) | George Goldberg | 2018-05-17 | 2 | -5/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10234: Make CLI roles command advanced-permissions aware. * Fix for loop scope. * Fix style. |