Merge branch 'master' into devel

This commit is contained in:
SachaG 2017-04-11 11:38:45 +09:00
commit 881ac78cac
34 changed files with 134 additions and 131 deletions

View file

@ -1,28 +1,28 @@
accounts-base@1.2.15
accounts-password@1.3.4
accounts-base@1.2.16
accounts-password@1.3.5
allow-deny@1.0.5
autoupdate@1.3.12
babel-compiler@6.14.1
babel-compiler@6.18.1
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.1.9
blaze@2.3.2
blaze-tools@1.0.10
boilerplate-generator@1.0.11
caching-compiler@1.1.9
callback-hook@1.0.10
check@1.2.5
ddp@1.2.5
ddp-client@1.3.3
ddp-client@1.3.4
ddp-common@1.2.8
ddp-rate-limiter@1.0.7
ddp-server@1.3.13
ddp-server@1.3.14
deps@1.0.12
diff-sequence@1.0.7
ecmascript@0.6.3
ecmascript@0.7.2
ecmascript-runtime@0.3.15
ejson@1.0.13
email@1.1.18
email@1.2.0
example-movies@0.0.0
fourseven:scss@4.5.0
geojson-utils@1.0.10
@ -42,8 +42,8 @@ meteorhacks:picker@1.0.3
minifier-css@1.2.16
minifier-js@1.2.18
minimongo@1.0.21
modules@0.7.9
modules-runtime@0.7.9
modules@0.8.1
modules-runtime@0.7.10
mongo@1.1.16
mongo-id@1.0.6
npm-bcrypt@0.9.2
@ -53,7 +53,7 @@ ordered-dict@1.0.9
percolatestudio:synced-cron@1.1.0
promise@0.8.8
random@1.0.10
rate-limit@1.0.7
rate-limit@1.0.8
reactive-dict@1.1.8
reactive-var@1.0.11
reload@1.1.11
@ -63,22 +63,22 @@ service-configuration@1.0.11
session@1.1.7
sha@1.0.9
shell-server@0.2.3
spacebars@1.0.13
spacebars@1.0.15
spacebars-compiler@1.0.13
srp@1.0.10
standard-minifier-css@1.3.4
standard-minifier-js@1.2.3
standard-minifiers@1.0.6
tracker@1.1.2
ui@1.0.12
ui@1.0.13
underscore@1.0.10
url@1.1.0
vulcan:accounts@1.3.0
vulcan:core@1.3.0
vulcan:forms@1.3.0
vulcan:i18n-en-us@1.3.0
vulcan:lib@1.3.0
vulcan:routing@1.3.0
vulcan:users@1.3.0
webapp@1.3.14
vulcan:accounts@1.3.2
vulcan:core@1.3.2
vulcan:forms@1.3.2
vulcan:i18n-en-us@1.3.2
vulcan:lib@1.3.2
vulcan:routing@1.3.2
vulcan:users@1.3.2
webapp@1.3.15
webapp-hashing@1.0.9

View file

@ -1,6 +1,8 @@
<img src="https://d3vv6lp55qjaqc.cloudfront.net/items/2B3C1z2V2y421p2I0P42/vulcan-logo-noborder.png" width="200">
# Vulcan (formerly Telescope)
[Version 1.3.0](https://github.com/TelescopeJS/Telescope/releases)
[Version 1.3.2](https://github.com/TelescopeJS/Telescope/releases)
This is the Apollo/GraphQL version of Telescope, now known as [Vulcan](http://vulcanjs.org). [You can find the documentation here](http://docs.vulcanjs.org/).

View file

@ -1,7 +1,7 @@
Package.describe({
name: "example-forum",
summary: "Telescope forum package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -12,13 +12,13 @@ Package.onUse(function (api) {
api.use([
// vulcan core
'vulcan:core@1.3.0',
'vulcan:core@1.3.2',
// vulcan packages
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0',
'vulcan:voting@1.3.0',
'vulcan:accounts@1.3.0',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2',
'vulcan:voting@1.3.2',
'vulcan:accounts@1.3.2',
'vulcan:email',
'vulcan:forms',
'vulcan:newsletter',

View file

@ -0,0 +1 @@
Vulcan accounts package (forked from https://github.com/studiointeract/accounts-ui)

View file

@ -1,6 +1,6 @@
Package.describe({
name: 'vulcan:accounts',
version: '1.3.0',
version: '1.3.2',
summary: 'Accounts UI for React in Meteor 1.3+',
git: 'https://github.com/studiointeract/accounts-ui',
documentation: 'README.md'
@ -9,7 +9,7 @@ Package.describe({
Package.onUse(function(api) {
api.versionsFrom('1.3');
api.use('vulcan:core@1.3.0');
api.use('vulcan:core@1.3.2');
api.use('ecmascript');
api.use('tracker');

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:api",
summary: "Telescope API package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,9 +10,9 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0'
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2'
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:base-components",
summary: "Telescope components package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -11,12 +11,12 @@ Package.onUse(function (api) {
api.use([
// Vulcan packages
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0',
'vulcan:voting@1.3.0',
'vulcan:accounts@1.3.0',
'vulcan:categories@1.3.0',
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2',
'vulcan:voting@1.3.2',
'vulcan:accounts@1.3.2',
'vulcan:categories@1.3.2',
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:base-styles",
summary: "Vulcan basic styles package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0',
'vulcan:core@1.3.2',
'fourseven:scss@4.5.0',
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:categories",
summary: "Telescope tags package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/telescope-tags.git"
});
@ -10,8 +10,8 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: 'vulcan:cloudinary',
summary: 'Telescope file upload package.',
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,8 +10,8 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:posts@1.3.0',
'vulcan:core@1.3.0'
'vulcan:posts@1.3.2',
'vulcan:core@1.3.2'
]);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:comments",
summary: "Telescope comments package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,8 +10,8 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:core",
summary: "Telescope core package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,13 +10,13 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:lib@1.3.0',
'vulcan:users@1.3.0',
'vulcan:routing@1.3.0'
'vulcan:lib@1.3.2',
'vulcan:users@1.3.2',
'vulcan:routing@1.3.2'
]);
api.imply([
'vulcan:lib@1.3.0'
'vulcan:lib@1.3.2'
]);
api.mainModule('lib/server/main.js', 'server');

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:debug",
summary: "Telescope debug package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -15,10 +15,10 @@ Package.onUse(function (api) {
// Vulcan packages
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:email@1.3.0',
'vulcan:comments@1.3.0'
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:email@1.3.2',
'vulcan:comments@1.3.2'
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:email-templates",
summary: "Telescope email templates package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,10 +10,10 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0',
'vulcan:email@1.3.0'
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2',
'vulcan:email@1.3.2'
]);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:email",
summary: "Telescope email package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0'
'vulcan:core@1.3.2'
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:embedly",
summary: "Telescope Embedly module package",
version: '1.3.0',
version: '1.3.2',
git: 'https://github.com/TelescopeJS/telescope-embedly.git'
});
@ -10,8 +10,8 @@ Package.onUse( function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'fourseven:scss@4.5.0'
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:events",
summary: "Telescope event tracking package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,7 +10,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:core@1.3.2',
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:forms-tags",
summary: "Telescope tag input package",
version: '1.3.0',
version: '1.3.2',
git: 'https://github.com/TelescopeJS/Telescope.git'
});
@ -10,8 +10,8 @@ Package.onUse( function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:forms@1.3.0'
'vulcan:core@1.3.2',
'vulcan:forms@1.3.2'
]);
api.mainModule("lib/export.js", ["client", "server"]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:forms-upload",
summary: "Vulcan package extending vulcan:forms to upload images to Cloudinary from a drop zone.",
version: "1.3.0",
version: "1.3.2",
git: 'https://github.com/xavcz/nova-forms-upload.git'
});
@ -10,8 +10,8 @@ Package.onUse( function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:forms@1.3.0',
'vulcan:core@1.3.2',
'vulcan:forms@1.3.2',
'fourseven:scss@4.5.0'
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:forms",
summary: "Form containers for React",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/meteor-utilities/react-form-containers.git"
});
@ -10,7 +10,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.3");
api.use([
'vulcan:core@1.3.0',
'vulcan:core@1.3.2',
'fourseven:scss@4.5.0'
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:getting-started",
summary: "Getting started posts",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/telescope-getting-started.git"
});
@ -14,10 +14,10 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0',
'vulcan:events@1.3.0',
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2',
'vulcan:events@1.3.2',
]);
// client

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:i18n-en-us",
summary: "Telescope i18n package (en_US)",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0'
'vulcan:core@1.3.2'
]);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:kadira",
summary: "Telescope Kadira package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0',
'vulcan:core@1.3.2',
'meteorhacks:kadira@2.30.0',
'kadira:debug@3.2.2',
'meteorhacks:kadira-profiler@1.2.1'

View file

@ -7,7 +7,7 @@ import SimpleSchema from 'simpl-schema';
Vulcan = {};
Vulcan.VERSION = '1.3.0';
Vulcan.VERSION = '1.3.2';
// ------------------------------------- Schemas -------------------------------- //

View file

@ -1,7 +1,7 @@
Package.describe({
name: 'vulcan:lib',
summary: 'Telescope libraries.',
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -13,19 +13,19 @@ Package.onUse(function (api) {
// Meteor packages
'meteor-base',
'meteor-base@1.0.4',
'mongo',
'tracker',
'service-configuration',
'standard-minifiers',
'modules',
'standard-minifiers@1.0.6',
'modules@0.7.9',
'accounts-base',
'check',
'http',
'email',
'ecmascript',
'ecmascript@0.6.3',
'service-configuration',
'shell-server',
'shell-server@0.2.3',
// Third-party packages

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:newsletter",
summary: "Telescope email newsletter package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/telescope-newsletter.git"
});
@ -10,11 +10,11 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0',
'vulcan:categories@1.3.0',
'vulcan:email@1.3.0'
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2',
'vulcan:categories@1.3.2',
'vulcan:email@1.3.2'
]);
api.mainModule('lib/server.js', 'server');

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:notifications",
summary: "Telescope notifications package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/telescope-notifications.git"
});
@ -10,13 +10,13 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:email@1.3.0',
'vulcan:core@1.3.2',
'vulcan:email@1.3.2',
]);
api.use([
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2',
], {weak: true});
api.mainModule('lib/modules.js', ['client', 'server']);

View file

@ -156,7 +156,7 @@ const schema = {
},
form: {
noselect: true,
options: Posts.statuses,
options: () => Posts.statuses,
group: 'admin'
},
group: formGroups.admin

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:posts",
summary: "Telescope posts package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/telescope-posts.git"
});
@ -10,8 +10,8 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:core@1.3.0',
'vulcan:events@1.3.0',
'vulcan:core@1.3.2',
'vulcan:events@1.3.2',
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:routing",
summary: "Vulcan router package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:lib@1.3.0',
'vulcan:lib@1.3.2',
]);
api.mainModule('lib/server/main.js', 'server');

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:rss",
summary: "Telescope RSS package",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/telescope-rss.git"
});
@ -10,9 +10,9 @@ Npm.depends({rss: "1.1.1"});
Package.onUse(function (api) {
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0'
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2'
]);
api.addFiles(['lib/headtags.js'], ['client', 'server']);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:subscribe",
summary: "Subscribe to posts, users, etc. to be notified of new activity",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/telescope-subscribe-to-posts.git"
});
@ -11,15 +11,15 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:notifications@1.3.0',
'vulcan:core@1.3.2',
'vulcan:notifications@1.3.2',
// dependencies on posts, categories are done with nested imports to reduce explicit dependencies
]);
api.use([
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0',
'vulcan:categories@1.3.0',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2',
'vulcan:categories@1.3.2',
], {weak: true});
api.mainModule("lib/modules.js", ["client"]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: 'vulcan:users',
summary: 'Telescope permissions.',
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'vulcan:lib@1.3.0'
'vulcan:lib@1.3.2'
]);
api.mainModule("lib/server.js", "server");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:voting",
summary: "Telescope scoring package.",
version: '1.3.0',
version: '1.3.2',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,9 +10,9 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'vulcan:core@1.3.0',
'vulcan:posts@1.3.0',
'vulcan:comments@1.3.0'
'vulcan:core@1.3.2',
'vulcan:posts@1.3.2',
'vulcan:comments@1.3.2'
], ['client', 'server']);
api.mainModule("lib/server.js", "server");