Merge branch 'devel'

Author: aaronjudd

.meteor/release

@@ -1 +1 @@
-0.8.2
+0.8.3

Dockerfile

@@ -14,6 +14,11 @@ MAINTAINER Aaron Judd <[email protected]>
 
 #Install required packages first
 RUN apt-get install -qq -y curl git gcc make build-essential imagemagick
+
+# Update to latest node
+RUN npm cache clean -f && npm install -g n && n 0.10.29
+
+# Install Meteor
 RUN curl https://install.meteor.com | /bin/sh
 RUN npm install --silent -g forever meteorite phantomjs
 

packages/.gitignore

@@ -81,3 +81,6 @@ headers
 /underscore-string-latest
 /emitter
 /kadira
+/iron-layout
+/iron-core
+/iron-dynamic-template

smart.json

@@ -1,35 +1,9 @@
 {
   "packages": {
     "spin": {},
-    "roles": {},
     "iron-router": {},
-    "autoform": {},
-    "collection2": {},
-    "underscore-string-latest": {},
-    "collection-hooks": {},
-    "handlebars-server": {},
-    "collectionFS": {},
-    "cfs-filesystem": {},
-    "cfs-s3": {},
-    "ui-dropped-event": {
-      "git": "https://github.com/ongoworks/Meteor-ui-dropped-event.git"
-    },
-    "reaction-app-packages": {
-      "git": "https://github.com/ongoworks/reaction-app-packages.git",
-      "tag": "v0.1.0"
-    },
     "reaction-core": {
       "git": "https://github.com/ongoworks/reaction-core.git"
-    },
-    "reaction-paypal": {
-      "git": "https://github.com/ongoworks/reaction-paypal.git"
-    },
-    "reaction-google-analytics": {
-      "git": "https://github.com/ongoworks/reaction-google-analytics.git",
-      "tag": "v0.1.0"
-    },
-    "reaction-helloworld": {
-      "git": "https://github.com/ongoworks/reaction-helloworld.git"
     }
   }
-}
+}

smart.lock

@@ -3,256 +3,47 @@
   "dependencies": {
     "basePackages": {
       "spin": {},
-      "roles": {},
       "iron-router": {},
-      "autoform": {},
-      "collection2": {},
-      "underscore-string-latest": {},
-      "collection-hooks": {},
-      "handlebars-server": {},
-      "collectionFS": {},
-      "cfs-filesystem": {},
-      "cfs-s3": {},
-      "ui-dropped-event": {
-        "git": "https://github.com/ongoworks/Meteor-ui-dropped-event.git",
-        "branch": "master"
-      },
-      "reaction-app-packages": {
-        "git": "https://github.com/ongoworks/reaction-app-packages.git",
-        "tag": "v0.1.0"
-      },
       "reaction-core": {
         "git": "https://github.com/ongoworks/reaction-core.git",
         "branch": "master"
-      },
-      "reaction-paypal": {
-        "git": "https://github.com/ongoworks/reaction-paypal.git",
-        "tag": "v0.1.0"
-      },
-      "reaction-google-analytics": {
-        "git": "https://github.com/ongoworks/reaction-google-analytics.git",
-        "tag": "v0.1.0"
-      },
-      "reaction-helloworld": {
-        "git": "https://github.com/ongoworks/reaction-helloworld.git",
-        "branch": "master"
       }
     },
     "packages": {
       "spin": {
         "git": "https://github.com/SachaG/meteor-spin.git",
-        "tag": "v0.2.2",
-        "commit": "3f655f0016228e4195acc784c45d3e3a247dc39f"
-      },
-      "roles": {
-        "git": "https://github.com/alanning/meteor-roles.git",
-        "tag": "v1.2.10",
-        "commit": "7ccb35de0a6cb0c9a0c3666badd04757e39c09a6"
+        "tag": "v2.0.4",
+        "commit": "f7b1e12a7caff1283cdb3671a393c182d0ae9862"
       },
       "iron-router": {
         "git": "https://github.com/EventedMind/iron-router.git",
-        "tag": "v0.7.1",
-        "commit": "d1ffb3f06ea4c112132b030f2eb1a70b81675ecb"
-      },
-      "autoform": {
-        "git": "https://github.com/aldeed/meteor-autoform.git",
-        "tag": "v0.13.5",
-        "commit": "27dd5b912eeba687b228a6a7c2c14eef63b12cca"
-      },
-      "collection2": {
-        "git": "https://github.com/aldeed/meteor-collection2.git",
-        "tag": "v0.4.2",
-        "commit": "4ff4b707bec8be434919730bf101325adb215444"
-      },
-      "underscore-string-latest": {
-        "git": "https://github.com/TimHeckel/meteor-underscore-string.git",
-        "tag": "v2.3.3",
-        "commit": "4a5d70eee48fbd90a6e6fc78747250d704a0b3bb"
-      },
-      "collection-hooks": {
-        "git": "https://github.com/matb33/meteor-collection-hooks.git",
-        "tag": "v0.7.0",
-        "commit": "20a6de81f3818f112bccf67b5e1d3db342cf0b18"
-      },
-      "handlebars-server": {
-        "git": "https://github.com/EventedMind/meteor-handlebars-server.git",
-        "tag": "v1.2.0",
-        "commit": "1b72c4e9d82af66293e50be4516c487d15d97464"
-      },
-      "collectionFS": {
-        "git": "https://github.com/CollectionFS/Meteor-CollectionFS.git",
-        "tag": "v0.4.8",
-        "commit": "fea890b1e27799ccc9f71046748fb23a84330a16"
-      },
-      "cfs-filesystem": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-filesystem.git",
-        "tag": "v0.0.26",
-        "commit": "1ec938265d937d81ff1323f2a8c8dbd301b233df"
-      },
-      "cfs-s3": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-s3.git",
-        "tag": "v0.0.29",
-        "commit": "97d3c544165c766115f2b91a6aaca54a7438a558"
-      },
-      "ui-dropped-event": {
-        "git": "https://github.com/ongoworks/Meteor-ui-dropped-event.git",
-        "branch": "master",
-        "commit": "867c3ecfa3a45e8e4d7d6ed933bacea93f408067"
-      },
-      "reaction-app-packages": {
-        "git": "https://github.com/ongoworks/reaction-app-packages.git",
-        "tag": "v0.1.0",
-        "commit": "13ac653b1ac26254111e2e370ee72fc4024205e1"
+        "tag": "v0.8.2",
+        "commit": "05415a8891ea87a00fb1e2388585f2ca5a38e0da"
       },
       "reaction-core": {
         "git": "https://github.com/ongoworks/reaction-core.git",
         "branch": "master",
-        "commit": "6f79e7aa897ed2af4926344dbc98938a02113c2e"
-      },
-      "reaction-paypal": {
-        "git": "https://github.com/ongoworks/reaction-paypal.git",
-        "tag": "v0.1.0",
-        "commit": "3110ba9b215b951b78575a4ab6c3204fce1ea10a"
-      },
-      "reaction-google-analytics": {
-        "git": "https://github.com/ongoworks/reaction-google-analytics.git",
-        "tag": "v0.1.0",
-        "commit": "150be64438bd0dadca0df0d72d47e50f9330f1d3"
+        "commit": "385695703f8314c43477f615ad4083190dbe7921"
       },
-      "reaction-helloworld": {
-        "git": "https://github.com/ongoworks/reaction-helloworld.git",
-        "branch": "master",
-        "commit": "a82bc07aa80b92299f7d12835e94d72a11ea2811"
+      "iron-layout": {
+        "git": "https://github.com/EventedMind/iron-layout.git",
+        "tag": "v0.2.0",
+        "commit": "4a2d53e35ba036b0c189c7ceca34be494d4c6c97"
       },
       "blaze-layout": {
         "git": "https://github.com/EventedMind/blaze-layout.git",
-        "tag": "v0.2.4",
-        "commit": "b40e9b0612329288d75cf52ad14a7da64bb8618f"
-      },
-      "simple-schema": {
-        "git": "https://github.com/aldeed/meteor-simple-schema.git",
-        "tag": "v0.5.1",
-        "commit": "a29956b34d03a4591dbd0eaed9d37009ef48b8db"
-      },
-      "moment": {
-        "git": "https://github.com/acreeger/meteor-moment.git",
-        "tag": "v2.6.0",
-        "commit": "26156df681750fd6e6ed77043eef32b6653ebbdf"
-      },
-      "cfs-base-package": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-base-package.git",
-        "tag": "v0.0.23",
-        "commit": "82bc49b4b8f66572b5551098e674e3a3b6c42ea3"
-      },
-      "cfs-file": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-file.git",
-        "tag": "v0.1.7",
-        "commit": "9fb8dcb9afd25c9f737497e102e266a2c81e481b"
-      },
-      "cfs-collection": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-collection.git",
-        "tag": "v0.4.10",
-        "commit": "62029f88f1cb4969e8338aa1cfaf34a8f167fa0e"
-      },
-      "cfs-collection-filters": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-collection-filters.git",
-        "tag": "v0.1.1",
-        "commit": "447134421887fcf20bd78c88d8c0913256f76db1"
-      },
-      "cfs-access-point": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-access-point.git",
-        "tag": "v0.0.30",
-        "commit": "a1a02ef8d145aae414bf9fe483f5944a24e35bf5"
-      },
-      "cfs-worker": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-worker.git",
-        "tag": "v0.0.16",
-        "commit": "172abbf679a9c9ce65d5cac7b51f23967aff94f7"
-      },
-      "cfs-upload-http": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-upload-http.git",
-        "tag": "v0.0.12",
-        "commit": "774bf581e0f3da269dc842672ed6c2da09fd2bdf"
-      },
-      "cfs-storage-adapter": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-storage-adapter.git",
-        "tag": "v0.0.28",
-        "commit": "8e0513815501d79b3d531a64f80717b4e9a34a42"
-      },
-      "cfs-filesaver": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-filesaver.git",
-        "tag": "v0.0.3",
-        "commit": "29cd7ae4dab138aa5e3792485945e742c46fc330"
-      },
-      "http-methods": {
-        "git": "https://github.com/CollectionFS/Meteor-http-methods.git",
-        "tag": "v0.0.22",
-        "commit": "5b0f7723f49436b8a0a930f284ed05f0b26021fe"
-      },
-      "numeral": {
-        "git": "https://github.com/vsivsi/meteor-numeral.git",
-        "tag": "v1.5.3",
-        "commit": "bdc97fc69bee7dadae1fc0f97fa6d9d76a03e73d"
-      },
-      "data-man": {
-        "git": "https://github.com/CollectionFS/Meteor-data-man.git",
-        "branch": "master",
-        "commit": "b929af5d64113c23480d4e2432bef836346d0b46"
-      },
-      "cfs-upload-ddp": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-upload-ddp.git",
-        "tag": "v0.0.10",
-        "commit": "17caf4f38462017c9545d2187020a7f4596e8c4f"
-      },
-      "cfs-tempstore": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-tempstore.git",
-        "tag": "v0.0.27",
-        "commit": "d8fe0422b2767391738ab537bf6749395e4030a0"
-      },
-      "emitter": {
-        "git": "https://github.com/Meteor-Reaction/meteor-emitter.git",
-        "tag": "v0.1.0",
-        "commit": "849a91bbe4e1e0636f49fa2e5141e74ed5137a27"
-      },
-      "http-publish": {
-        "git": "https://github.com/CollectionFS/Meteor-http-publish.git",
-        "tag": "v0.0.10",
-        "commit": "f308999d074a3c4c056a88c431be04cead93228b"
-      },
-      "cfs-gridfs": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-gridfs.git",
-        "tag": "v0.0.22",
-        "commit": "2d008d4594e55d07006674b25a7e9cf8d25a3917"
-      },
-      "power-queue": {
-        "git": "https://github.com/CollectionFS/Meteor-power-queue.git",
-        "tag": "v0.9.9",
-        "commit": "567d3905784a8be6aacfbb69d477003ba9b5c4b5"
-      },
-      "reactive-list": {
-        "git": "https://github.com/CollectionFS/Meteor-reactive-list.git",
-        "tag": "v0.0.7",
-        "commit": "5855e3795947145b20a331250113ce927060445b"
-      },
-      "cfs-graphicsmagick": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-graphicsmagick.git",
-        "tag": "v0.0.14",
-        "commit": "a9178346f25b0556f1470c7b8e97925ab5f534a9"
-      },
-      "cfs-ejson-file": {
-        "git": "https://github.com/CollectionFS/Meteor-cfs-ejson-file.git",
-        "tag": "v0.0.7",
-        "commit": "aa80b46e73f3c9dcfec75106d1078b56be475bd7"
-      },
-      "reactive-property": {
-        "git": "https://github.com/CollectionFS/Meteor-reactive-property.git",
-        "tag": "v0.0.1",
-        "commit": "f742b8656bb88fafff2a9c3a32ff1f97b3ebf2f7"
-      },
-      "micro-queue": {
-        "git": "https://github.com/CollectionFS/Meteor-micro-queue.git",
-        "tag": "v0.0.3",
-        "commit": "70266ce2c273a12c5af17b5c056253936caabb01"
+        "tag": "v0.2.5",
+        "commit": "273e3ab7d005d91a1a59c71bd224533b4dae2fbd"
+      },
+      "iron-core": {
+        "git": "https://github.com/EventedMind/iron-core.git",
+        "tag": "v0.2.0",
+        "commit": "0e48b5dc50d03f01025b7b900fb5ce2f13d52cad"
+      },
+      "iron-dynamic-template": {
+        "git": "https://github.com/EventedMind/iron-dynamic-template.git",
+        "tag": "v0.2.1",
+        "commit": "4dd1185c4d9d616c9abdb3f33e4a7d5a88db7e18"
       }
     }
   }