Merge pull request #87 from mdhaman/1.0

Reverting the bower changes.

Dockerfile

@@ -15,7 +15,7 @@ curl libfontconfig nodejs npm nginx \
 && ln --symbolic /usr/bin/nodejs /usr/bin/node
 
 RUN npm install -g npm
-RUN npm -g install grunt-cli
+RUN npm -g install grunt-cli bower
 
 # Set the locale
 RUN locale-gen en_US.UTF-8
@@ -49,6 +49,9 @@ RUN cd /tmp && pip3 install -U -r /tmp/requirements.txt
 # install client dependencies
 COPY ./client/package.json /opt/superdesk/client/
 RUN cd ./client && npm install
+COPY ./client/bower.json /opt/superdesk/client/
+COPY ./client/.bowerrc /opt/superdesk/client/
+RUN cd ./client && bower --allow-root install
 
 # copy server sources
 COPY ./server /opt/superdesk

client/.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory": "bower_components"
+}

client/bower.json

@@ -1,27 +1,35 @@
 {
   "name": "superdesk-client",
   "dependencies": {
-    "requirejs": "2.1.15",
     "jquery": "2.1.3",
     "lodash": "3.0.1",
     "bootstrap": "3.1.0",
     "momentjs": "2.10.6",
     "moment-timezone": "0.4.0",
-    "angular": "1.3.9",
-    "angular-resource": "1.3.9",
-    "angular-route": "1.3.9",
-    "angular-mocks": "1.3.9",
+    "angular": "1.4.8",
+    "angular-resource": "1.4.8",
+    "angular-route": "1.4.8",
+    "angular-mocks": "1.4.8",
     "angular-gettext": "2.0.1",
-    "angular-bootstrap": "0.12.1",
-    "gridster": "0.2.1",
+    "angular-bootstrap": "0.13.0",
+    "gridster": "0.5.6",
     "d3": "3.5.3",
     "jcrop": "0.9.12",
-    "ng-file-upload": "1.6.12",
+    "ng-file-upload": "11.2.3",
     "raven-js": "1.1.11",
     "jquery-ui": "1.11.2",
-    "medium-editor": "4.9.0",
+    "medium-editor": "5.14.4",
     "ment.io": "0.9.22",
-    "langmap": "~0.0.10"
+    "angular-moment": "~0.10.3",
+    "classnames": "~2.2.0",
+    "react": "~0.14.3",
+    "protractor": "~3.0.0",
+    "langmap": "~0.0.10",
+    "angular-animate": "1.4.8",
+    "angular-embed": "~3.0.1",
+    "angular-contenteditable": "~0.3.8",
+    "angular-vs-repeat": "^1.1.4",
+    "exif-js": "^2.1.1"
   },
   "ignore": [
     "**/.*",
@@ -30,7 +38,12 @@
     "setup.py",
     "client/docs"
   ],
+  "devDependencies": {
+    "rangy": "~1.3.0"
+  },
   "resolutions": {
-    "angular": "1.3.9"
+    "angular": "1.4.8",
+    "ng-file-upload": "11.2.3",
+    "medium-editor": "5.14.4"
   }
 }