Fixs from master

diff --git a/.dockerignore b/.dockerignore
index 3d2ee082c887cfd0851a46954ab85cbd27c28399..a692b3d6e8525bba7beb4f56c304e58ae9e1535c 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,8 +4,5 @@
 app/
 build/
 dist/
-media/
-static/
-var/
-backup/
+data/
 tmp/

diff --git a/app/settings.py b/app/settings.py
index 696d182b8b157b3cc80cea37877a8efb279a677d..1f4e860acaef91a258f327159442d2d9686b7e3e 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -333,20 +333,20 @@ HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
 BOWER_COMPONENTS_ROOT = '/srv/bower/'
 BOWER_PATH = '/usr/local/bin/bower'
 BOWER_INSTALLED_APPS = (
-    'jquery',
+    'jquery#2.2.4',
     'jquery-migrate#~1.2.1',
-    'underscore',
-    'bootstrap',
+    'underscore#1.8.3',
+    'bootstrap#3.3.6',
     'bootstrap-select#1.5.4',
     'font-awesome#4.4.0',
     'angular#1.2.26',
-    'angular-bootstrap-select',
+    'angular-bootstrap-select#0.0.5',
     'angular-resource#1.2.26',
-    'raphael',
+    'raphael#2.2.0',
     'soundmanager#V2.97a.20150601',
     'https://github.com/Parisson/loaders.git',
     'https://github.com/Parisson/ui.git',
-    'jquery-ui',
+    'jquery-ui#1.11.4',
     'tablesorter',
     'video.js',
     'sass-bootstrap-glyphicons',