diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-12-05 16:35:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 16:35:46 -0500 |
| commit | 150de584c348d6317199fd619f0c144464b8f755 (patch) | |
| tree | 1a9a6c327706e6be0adb00df519b9e027e9e0e0a /app/plugin.go | |
| parent | c171872472672d129e1e4dbc99930d75a4cd59c7 (diff) | |
| download | chat-150de584c348d6317199fd619f0c144464b8f755.tar.gz chat-150de584c348d6317199fd619f0c144464b8f755.tar.bz2 chat-150de584c348d6317199fd619f0c144464b8f755.zip | |
PLT-8131 Bundled zoom plugin (#7947)
* Bundled zoom plugin
* Update plugin to latest
Diffstat (limited to 'app/plugin.go')
| -rw-r--r-- | app/plugin.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/plugin.go b/app/plugin.go index 29031b9d7..087ce1abf 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -22,6 +22,7 @@ import ( builtinplugin "github.com/mattermost/mattermost-server/app/plugin" "github.com/mattermost/mattermost-server/app/plugin/jira" "github.com/mattermost/mattermost-server/app/plugin/ldapextras" + "github.com/mattermost/mattermost-server/app/plugin/zoom" "github.com/mattermost/mattermost-server/plugin" "github.com/mattermost/mattermost-server/plugin/pluginenv" @@ -29,6 +30,7 @@ import ( var prepackagedPlugins map[string]func(string) ([]byte, error) = map[string]func(string) ([]byte, error){ "jira": jira.Asset, + "zoom": zoom.Asset, } func (a *App) initBuiltInPlugins() { @@ -377,7 +379,7 @@ func (a *App) InitPlugins(pluginPath, webappPath string) { if _, err := a.installPlugin(bytes.NewReader(tarball), true); err != nil { l4g.Error("failed to install prepackaged plugin: " + err.Error()) } - if _, ok := a.Config().PluginSettings.PluginStates[id]; !ok { + if _, ok := a.Config().PluginSettings.PluginStates[id]; !ok && id != "zoom" { if err := a.EnablePlugin(id); err != nil { l4g.Error("failed to enable prepackaged plugin: " + err.Error()) } |