Merge remote-tracking branch 'origin/vue' into master-merge-vue

This commit is contained in:
Julius Härtl
2020-01-25 10:42:05 +01:00
137 changed files with 27543 additions and 17157 deletions

View File

@@ -194,9 +194,10 @@ class Application extends App {
$resourceManager = $this->getContainer()->query(\OCP\Collaboration\Resources\IProviderManager::class);
}
$resourceManager->registerResourceProvider(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
$resourceManager->registerResourceProvider(\OCA\Deck\Collaboration\Resources\ResourceProviderCard::class);
\OC::$server->getEventDispatcher()->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
\OCP\Util::addScript('deck', 'build/collections');
\OCP\Util::addScript('deck', 'collections');
});
}