Merge pull request #1860 from petrjasek/master

fix(upload): add exif lib to index
superdesk · Mar 23, 2016 · 6b7539b · 6b7539b
2 parents 2922eef + 64971f8
commit 6b7539b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/client/app/index.html b/client/app/index.html
@@ -55,6 +55,7 @@
     <script src="bower_components/angular-embed/dist/angular-embed.js"></script>
     <script src="bower_components/angular-contenteditable/angular-contenteditable.js"></script>
     <script src="bower_components/angular-vs-repeat/src/angular-vs-repeat.js"></script>
+    <script src="bower_components/exif-js/exif.js"></script>
     <!-- endbuild -->
 
     <!-- build:js superdesk-core.js -->

diff --git a/client/bower.json b/client/bower.json
@@ -28,7 +28,8 @@
     "angular-animate": "1.4.8",
     "angular-embed": "~3.0.1",
     "angular-contenteditable": "~0.3.8",
-    "angular-vs-repeat": "^1.1.4"
+    "angular-vs-repeat": "^1.1.4",
+    "exif-js": "^2.1.1"
   },
   "ignore": [
     "**/.*",
@@ -41,6 +42,8 @@
     "rangy": "~1.3.0"
   },
   "resolutions": {
-    "angular": "1.4.8"
+    "angular": "1.4.8",
+    "ng-file-upload": "11.2.3",
+    "medium-editor": "4.9.0"
   }
 }