From dc35ec209e085678947e0cd27ac99cc95afe5d6b Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Tue, 20 Dec 2016 09:07:25 +0100 Subject: [PATCH] Update bower path changed path in order to avoid duplication of sources --- .bowerrc | 2 +- .gitignore | 1 - bower.json | 6 +++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.bowerrc b/.bowerrc index ab67325340c..a114d426685 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1 +1 @@ -{ "directory": "app/Resources/public/assets" } \ No newline at end of file +{ "directory": "web/assets" } \ No newline at end of file diff --git a/.gitignore b/.gitignore index 46ff4dfc852..42c5902e526 100755 --- a/.gitignore +++ b/.gitignore @@ -47,5 +47,4 @@ plugin/vchamilo/templates/* # Stuff updated through composer - Remove just before release composer.lock vendor -web/assets/* diff --git a/bower.json b/bower.json index ebcd842aa29..10441e391b2 100644 --- a/bower.json +++ b/bower.json @@ -40,7 +40,11 @@ "jsPlumb" : "1.3.7", "xcolor": "*", "d3" : "3.5.4", - "colorbrewer" : "*" + "colorbrewer" : "*", + "emojione" : "2.2.*", + "webodf.js" : "0.5.*", + "wodo.texteditor" : "0.5.*", + "emojionearea" : "3.1.*" }, "resolutions": { "jquery": "2.1.4"