Merge pull request #4 from OrdnanceSurvey/dev

latest release from dev
OrdnanceSurvey · Mar 30, 2016 · b6030cf · b6030cf
2 parents d979be8 + 0d9662a
commit b6030cf
Show file tree

Hide file tree

Showing 8 changed files with 563 additions and 260 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,15 @@
+# ignore vendor libraries
+node_modules/
+bower_components/
+typings/
+
+# intellij
+*.iml
 .idea
-bower_components
-node_modules
+
+# built files
+build/
+dist/
+
+# misc
+npm-debug.log
diff --git a/bower.json b/bower.json
@@ -25,13 +25,13 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "~1.2.28",
-    "rxjs": "~2.5.2",
-    "angular-rx": "~0.0.14",
-    "jquery": "~2.1.4"
+    "angular": "1.x",
+    "rxjs": ">0.0.14",
+    "angular-rx": "1.x",
+    "jquery": "~2"
   },
   "devDependencies": {
-    "requirejs": "~2.1.18",
-    "angular-order-object-by": "~1.1.1"
+    "requirejs": "2.x",
+    "angular-order-object-by": "1.x"
   }
 }