Граф коммитов

14 Коммитов

Автор SHA1 Сообщение Дата
Jesús Espino
d9390244af MM-8810: Add CSV Compliance export (#8966)
* MM-8810: Add CSV Compliance export

* Only allowing to schedule actiances export throught the cli

* De-duplicating some code

* Fixes on texts

* Fixes on translations
2018-06-22 11:15:19 +02:00
Jesse Hallam
dd35ad43ca MM-10370: serve subpath (#8968)
* factor out GetSubpathFromConfig

* mv web/subpath.go to utils/subpath.go

* serve up web, api and ws on /subpath if configured

* pass config to utils.RenderWeb(App)?Error

This allows the methods to extract the configured subpath and redirect
to the appropriate `/subpath/error` handler.

* ensure GetSubpathFromConfig returns trailing slashes deterministically

* fix error 404 handling

* redirect /subpath to /subpath/

This is necessary for the static handler to match, otherwise none of the
registered routes find anything. This also makes it no longer necessary
to add trailing slashes in the root router.
2018-06-21 11:31:51 -07:00
Jesse Hallam
f106417103 MM-10367: rewrite subpath assets on startup (#8944)
Examine ServiceSettings.SiteURL on startup and rewrite assets
accordingly if not in a development environment.

Also export `mattermost config subpath` command to manually do same.

This accompanies a webapp PR to use the updated `root.html` to define
the necessary webpack asset path for dynamically loading assets.
2018-06-14 08:26:22 -07:00
George Goldberg
1b821c7319 MM-10684: Show logs on Slack Import CLI. (#8936) 2018-06-11 15:48:32 +01:00
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