Merge remote-tracking branch 'origin/master'

Conflicts: versions.json
Urigo · Oct 24, 2014 · 7a3cea9 · 7a3cea9
2 parents a740ffb + 3b79f66
commit 7a3cea9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 28 deletions.
diff --git a/ionic-override.css b/ionic-override.css
@@ -0,0 +1,6 @@
+@font-face {
+    font-family: "Ionicons";
+    src: url("/packages/urigo_ionic/packages/bower/ionic/release/fonts/ionicons.eot");
+    src: url("/packages/urigo_ionic/packages/bower/ionic/release/fonts/ionicons.eot?v=1.5.2") format("embedded-opentype"), url("/packages/urigo_ionic/packages/bower/ionic/release/fonts/ionicons.ttf") format("truetype"), url("/packages/urigo_ionic/packages/bower/ionic/release/fonts/ionicons.woff") format("woff"), url("/packages/urigo_ionic/packages/bower/ionic/release/fonts/ionicons.svg") format("svg");
+    font-weight: normal;
+    font-style: normal; }
diff --git a/package.js b/package.js
@@ -15,6 +15,9 @@ Package.on_use(function (api, where) {
   // Add bower
   api.addFiles('smart.json', 'client');
 
+  // Fix icons to absolute path
+  api.addFiles('ionic-override.css', 'client');
+
   // ionic files
   api.addFiles('init.js', 'client');
 });
diff --git a/versions.json b/versions.json
@@ -2,119 +2,119 @@
   "dependencies": [
     [
       "application-configuration",
-      "1.0.2"
+      "1.0.3"
     ],
     [
       "base64",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "binary-heap",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "blaze",
-      "2.0.1"
+      "2.0.2"
     ],
     [
       "callback-hook",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "check",
-      "1.0.1"
+      "1.0.2"
     ],
     [
       "ddp",
-      "1.0.9"
+      "1.0.10"
     ],
     [
       "deps",
-      "1.0.3"
+      "1.0.5"
     ],
     [
       "ejson",
-      "1.0.3"
+      "1.0.4"
     ],
     [
       "follower-livedata",
-      "1.0.1"
+      "1.0.2"
     ],
     [
       "geojson-utils",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "htmljs",
-      "1.0.1"
+      "1.0.2"
     ],
     [
       "id-map",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "jquery",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "json",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "logging",
-      "1.0.3"
+      "1.0.4"
     ],
     [
       "meteor",
-      "1.1.1"
+      "1.1.2"
     ],
     [
       "minimongo",
-      "1.0.3"
+      "1.0.4"
     ],
     [
       "mongo",
-      "1.0.6"
+      "1.0.7"
     ],
     [
       "mquandalle:bower",
       "0.1.11"
     ],
     [
       "observe-sequence",
-      "1.0.2"
+      "1.0.3"
     ],
     [
       "ordered-dict",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "random",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "reactive-var",
-      "1.0.2"
+      "1.0.3"
     ],
     [
       "retry",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "templating",
-      "1.0.7"
+      "1.0.8"
     ],
     [
       "tinytest",
-      "1.0.2"
+      "1.0.3"
     ],
     [
       "tracker",
-      "1.0.2"
+      "1.0.3"
     ],
     [
       "underscore",
-      "1.0.0"
+      "1.0.1"
     ],
     [
       "urigo:angular",