Merge branch 'devel'

# Conflicts:
#	.github/CONTRIBUTING.md
#	packages/vulcan-lib/lib/server/mutations.js

Author: SachaG

.github/CONTRIBUTING.md

@@ -1,3 +1,3 @@
-Before starting on a new feature, please [check out the roadmap](https://trello.com/b/oLMMqjVL/telescope-roadmap) and come check-in in the [Vulcan Slack channel](http://slack.telescopeapp.org/).
+Before starting on a new feature, please [check out the roadmap](https://trello.com/b/dwPR0LTz/vulcanjs-roadmap) and come check-in in the [Vulcan Slack channel](http://slack.telescopeapp.org/).
 
-Also, all PRs should be made to the `devel` branch, not `master`.
+Also, all PRs should be made to the `devel` branch, not `master`. 

.meteor/packages

@@ -22,3 +22,6 @@ example-simple
 # example-permissions
 # example-membership
 # example-interfaces
+# example-reactions
+
+vulcan:debug

.meteor/release

@@ -1 +1 @@
-METEOR@1.5.1
+METEOR@1.5.2.2

.meteor/versions

@@ -1,28 +1,28 @@
-accounts-base@1.3.1
+accounts-base@1.3.4
 accounts-password@1.4.0
-allow-deny@1.0.6
+allow-deny@1.0.9
 autoupdate@1.3.12
-babel-compiler@6.19.4
+babel-compiler@6.20.0
 babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
-boilerplate-generator@1.1.2
+boilerplate-generator@1.2.0
 buffer@0.0.0
 caching-compiler@1.1.9
 callback-hook@1.0.10
 check@1.2.5
-ddp@1.3.0
-ddp-client@2.0.0
+ddp@1.3.1
+ddp-client@2.1.3
 ddp-common@1.2.9
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.0
+ddp-server@2.0.2
 diff-sequence@1.0.7
-dynamic-import@0.1.1
-ecmascript@0.8.2
+dynamic-import@0.1.3
+ecmascript@0.8.3
 ecmascript-runtime@0.4.1
 ecmascript-runtime-client@0.4.3
 ecmascript-runtime-server@0.4.1
-ejson@1.0.13
+ejson@1.0.14
 email@1.2.3
 example-simple@0.0.0
 fourseven:scss@4.5.4
@@ -33,22 +33,23 @@ id-map@1.0.9
 livedata@1.0.18
 localstorage@1.1.1
 logging@1.1.17
-meteor@1.7.0
+meteor@1.7.2
 meteor-base@1.1.0
 meteorhacks:inject-initial@1.0.4
 meteorhacks:picker@1.0.3
 minifier-css@1.2.16
-minifier-js@2.1.1
-minimongo@1.2.1
-modules@0.9.2
+minifier-js@2.1.4
+minimongo@1.3.2
+modules@0.10.0
 modules-runtime@0.8.0
-mongo@1.1.22
+mongo@1.2.2
+mongo-dev-server@1.0.1
 mongo-id@1.0.6
 npm-bcrypt@0.9.3
 npm-mongo@2.2.30
 ordered-dict@1.0.9
 percolatestudio:synced-cron@1.1.0
-promise@0.8.9
+promise@0.9.0
 random@1.0.10
 rate-limit@1.0.8
 reactive-dict@1.1.9
@@ -61,19 +62,21 @@ session@1.1.7
 sha@1.0.9
 shell-server@0.2.4
 srp@1.0.10
-standard-minifier-css@1.3.4
-standard-minifier-js@2.1.1
+standard-minifier-css@1.3.5
+standard-minifier-js@2.1.2
 standard-minifiers@1.1.0
 tracker@1.1.3
 underscore@1.0.10
 url@1.1.0
-vulcan:accounts@1.7.0
-vulcan:core@1.7.0
-vulcan:forms@1.7.0
-vulcan:i18n@1.7.0
-vulcan:i18n-en-us@1.7.0
-vulcan:lib@1.7.0
-vulcan:routing@1.7.0
-vulcan:users@1.7.0
-webapp@1.3.17
+vulcan:accounts@1.8.0
+vulcan:core@1.8.0
+vulcan:debug@1.8.0
+vulcan:email@1.8.0
+vulcan:forms@1.8.0
+vulcan:i18n@1.8.0
+vulcan:i18n-en-us@1.8.0
+vulcan:lib@1.8.0
+vulcan:routing@1.8.0
+vulcan:users@1.8.0
+webapp@1.3.19
 webapp-hashing@1.0.9

package-lock.json

@@ -18,11 +18,13 @@
     "body-parser": "^1.15.2",
     "classnames": "^2.2.3",
     "cookie-parser": "^1.4.3",
+    "cross-fetch": "^0.0.8",
     "crypto-js": "^3.1.9-1",
     "dataloader": "^1.3.0",
     "deepmerge": "^1.2.0",
     "escape-string-regexp": "^1.0.5",
     "express": "^4.14.0",
+    "flat": "^4.0.0",
     "formsy-react": "^0.19.5",
     "formsy-react-components": "^0.10.1",
     "graphql": "^0.9.6",
@@ -40,7 +42,6 @@
     "import": "0.0.6",
     "intl": "^1.2.4",
     "intl-locales-supported": "^1.0.0",
-    "isomorphic-fetch": "^2.2.1",
     "juice": "^1.11.0",
     "mailchimp": "^1.1.6",
     "marked": "^0.3.5",
@@ -73,7 +74,7 @@
     "rss": "^1.2.1",
     "sanitize-html": "^1.11.4",
     "sendy-api": "^0.1.0",
-    "simpl-schema": "^0.2.3",
+    "simpl-schema": "^0.3.2",
     "speakingurl": "^9.0.0",
     "stripe": "^4.23.1",
     "styled-components": "^2.1.1",

package.json

@@ -1,7 +1,7 @@
 Package.describe({
   name: "boilerplate-generator",
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.1.2'
+  version: '1.2.0'
 });
 
 Package.onUse(api => {

packages/_boilerplate-generator/package.js

@@ -2,7 +2,7 @@ import { Components, getRawComponent, replaceComponent } from 'meteor/vulcan:cor
 import React from 'react';
 import { FormattedMessage } from 'meteor/vulcan:i18n';
 import { Link } from 'react-router';
-import Posts from "meteor/vulcan:posts";
+import { Posts } from 'meteor/example-forum';
 import moment from 'moment';
 
 class CustomPostsItem extends getRawComponent('PostsItem') {

packages/example-customization/lib/components/CustomPostsItem.jsx

@@ -1,4 +1,4 @@
-import Posts from "meteor/vulcan:posts";
+import { Posts } from 'meteor/example-forum';
 
 /*
 Let's assign a color to each post (why? cause we want to, that's why).

packages/example-customization/lib/custom_fields.js

@@ -10,11 +10,9 @@ VulcanEmail.addEmails({
   customEmail: {
     template: "customEmail",
     path: "/email/custom-email",
-    getProperties() {return {};},
     subject() {
       return "My awesome new email";
-    },
-    getTestObject() {return {};}
+    }
   }
 
 });