Merge branch 'devel'

# Conflicts:
#	packages/vulcan-newsletter/lib/server/integrations/mailchimp.js

Author: SachaG

package.json

@@ -11,7 +11,8 @@
   },
   "dependencies": {
     "analytics-node": "^2.1.1",
-    "apollo-client": "^1.0.1",
+    "apollo-client": "^1.2.2",
+    "apollo-errors": "^1.4.0",
     "babel-runtime": "^6.18.0",
     "bcrypt": "^0.8.7",
     "body-parser": "^1.15.2",
@@ -60,6 +61,7 @@
     "react-dropzone": "^3.12.2",
     "react-helmet": "^3.1.0",
     "react-intl": "^2.1.3",
+    "react-loadable": "^4.0.3",
     "react-places-autocomplete": "^5.0.0",
     "react-redux": "^5.0.1",
     "react-router": "^3.0.0",

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

@@ -1,8 +1,9 @@
 import { Components, getRawComponent, replaceComponent } from 'meteor/vulcan:core';
 import React from 'react';
-import { FormattedMessage, FormattedRelative } from 'meteor/vulcan:i18n';
+import { FormattedMessage } from 'meteor/vulcan:i18n';
 import { Link } from 'react-router';
 import Posts from "meteor/vulcan:posts";
+import moment from 'moment';
 
 class CustomPostsItem extends getRawComponent('PostsItem') {
 
@@ -39,7 +40,7 @@ class CustomPostsItem extends getRawComponent('PostsItem') {
 
           <div className="posts-item-meta">
             {post.user? <div className="posts-item-user"><Components.UsersAvatar user={post.user} size="small"/><Components.UsersName user={post.user}/></div> : null}
-            <div className="posts-item-date"><FormattedRelative value={post.postedAt}/></div>
+            <div className="posts-item-date">{post.postedAt ? moment(new Date(post.postedAt)).fromNow() : <FormattedMessage id="posts.dateNotDefined"/>}</div>
             <div className="posts-item-comments">
               <Link to={Posts.getPageUrl(post)}>
                 {!post.commentCount || post.commentCount === 0 ? <FormattedMessage id="comments.count_0"/> : 
@@ -56,7 +57,6 @@ class CustomPostsItem extends getRawComponent('PostsItem') {
 
         {this.renderCommenters()}
 
-
       </div>
     )
   }

packages/example-forum/package.js

@@ -1,8 +1,8 @@
 Package.describe({
   name: "example-forum",
-  summary: "Telescope forum package",
+  summary: "Vulcan forum package",
   version: '1.5.0',
-  git: "https://github.com/TelescopeJS/Telescope.git"
+  git: "https://github.com/VulcanJS/Vulcan.git"
 });
 
 Package.onUse(function (api) {

packages/example-instagram/lib/modules/comments/collection.js

@@ -4,11 +4,9 @@ The main Comments collection definition file.
 
 */
 
-import { createCollection } from 'meteor/vulcan:core';
+import { createCollection, getDefaultResolvers, getDefaultMutations } from 'meteor/vulcan:core';
 import schema from './schema.js';
-import resolvers from './resolvers.js';
 import './fragments.js';
-import mutations from './mutations.js';
 import './permissions.js';
 
 const Comments = createCollection({
@@ -22,9 +20,9 @@ const Comments = createCollection({
 
   schema,
 
-  resolvers,
+  resolvers: getDefaultResolvers('Comments'),
 
-  mutations,
+  mutations: getDefaultMutations('Comments'),
 
 });
 

packages/example-instagram/lib/modules/comments/mutations.js

@@ -25,7 +25,14 @@ const schema = {
     type: String,
     optional: true,
     viewableBy: ['guests'],
-    resolveAs: 'user: User', // resolve as "user" on the client
+    resolveAs: {
+      fieldName: 'user',
+      type: 'User', 
+      resolver(comment, args, context) {
+        return context.Users.findOne({ _id: comment.userId }, { fields: context.Users.getViewableFields(context.currentUser, context.Users) });
+      },
+      addOriginalField: true
+    }
   },
 
   // custom properties

packages/example-instagram/lib/modules/comments/resolvers.js

@@ -4,11 +4,9 @@ The main Pics collection definition file.
 
 */
 
-import { createCollection } from 'meteor/vulcan:core';
+import { createCollection, getDefaultResolvers, getDefaultMutations } from 'meteor/vulcan:core';
 import schema from './schema.js';
-import resolvers from './resolvers.js';
 import './fragments.js';
-import mutations from './mutations.js';
 import './permissions.js';
 
 const Pics = createCollection({
@@ -19,9 +17,9 @@ const Pics = createCollection({
 
   schema,
 
-  resolvers,
+  resolvers: getDefaultResolvers('Pics'),
 
-  mutations,
+  mutations: getDefaultMutations('Pics'),
 
 });