Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'advanced-permissions-phase-2' | George Goldberg | 2018-05-31 | 1 | -0/+1 |
|\ | |||||
| * | MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860) | Jesús Espino | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
* | | MM-10731 Revert site url kill server (#8877) | Christopher Speller | 2018-05-30 | 1 | -14/+6 |
|/ | | | | | | | | * Revert "MM-9983 Requiring SiteURL to be set. (#8769)" This reverts commit 0432f995ec27de9ee6cc2f5847d4a17fcc095a26. * Add log message for SiteURL not being set. | ||||
* | MM-9983 Requiring SiteURL to be set. (#8769) | Christopher Speller | 2018-05-18 | 1 | -1/+15 |
| | | | | | | | | * Requiring SiteURL to be set. * Modifying to make tests pass. * Fixing test. | ||||
* | Renaming platform binary to mattermost. (#8801) | Christopher Speller | 2018-05-17 | 1 | -0/+299 |