George Goldberg
|
27e7841a73
|
Merge branch 'advanced-permissions-phase-2'
|
2018-05-31 10:25:31 +01:00 |
|
Christopher Speller
|
af4e907f5e
|
MM-10731 Revert site url kill server (#8877)
* Revert "MM-9983 Requiring SiteURL to be set. (#8769)"
This reverts commit 0432f995ec.
* Add log message for SiteURL not being set.
|
2018-05-30 09:58:24 -04:00 |
|
George Goldberg
|
994ccf475f
|
Add note about clearing caches when permissions reset CLI done. (#8823)
* Add note about clearing caches when permissions reset CLI done.
* Adjust text.
|
2018-05-30 11:21:36 +01:00 |
|
Jesús Espino
|
e88fe4bb1d
|
MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)
* 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.
|
2018-05-29 15:58:12 +01:00 |
|
Martin Kraft
|
4c683aff76
|
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
|
2018-05-22 12:54:00 -04:00 |
|
Christopher Speller
|
88a8703766
|
Fixing CMD docs. (#8827)
|
2018-05-18 10:34:37 -07:00 |
|
Christopher Speller
|
0432f995ec
|
MM-9983 Requiring SiteURL to be set. (#8769)
* Requiring SiteURL to be set.
* Modifying to make tests pass.
* Fixing test.
|
2018-05-18 08:37:43 -07:00 |
|
Martin Kraft
|
c6ba5c32d6
|
Merge fix.
|
2018-05-18 08:41:44 -04:00 |
|
Martin Kraft
|
78d95a25f7
|
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
|
2018-05-18 08:23:02 -04:00 |
|
Christopher Speller
|
11cbb59747
|
Renaming platform binary to mattermost. (#8801)
|
2018-05-17 12:40:40 -07:00 |
|