Merge branch 'master' into devel

This commit is contained in:
Sacha Greif 2015-08-16 17:35:30 +09:00
commit 5e70ba23c7
41 changed files with 137 additions and 135 deletions

View file

@ -119,41 +119,41 @@ spiderable@1.0.7
srp@1.0.3
standard-app-packages@1.0.5
tap:i18n@1.5.1
telescope:api@0.22.2
telescope:comments@0.22.2
telescope:core@0.22.2
telescope:daily@0.22.2
telescope:datetimepicker@0.22.2
telescope:debug@0.22.2
telescope:email@0.22.2
telescope:embedly@0.22.2
telescope:events@0.22.2
telescope:getting-started@0.22.2
telescope:i18n@0.22.2
telescope:invites@0.22.2
telescope:kadira@0.22.2
telescope:lib@0.22.2
telescope:messages@0.22.2
telescope:migrations@0.22.2
telescope:newsletter@0.22.2
telescope:notifications@0.22.2
telescope:pages@0.22.2
telescope:post-by-feed@0.22.2
telescope:posts@0.22.3
telescope:releases@0.22.2
telescope:rss@0.22.2
telescope:scoring@0.22.2
telescope:search@0.22.2
telescope:settings@0.22.2
telescope:share@0.22.2
telescope:singleday@0.22.2
telescope:subscribe-to-posts@0.22.2
telescope:tagline-banner@0.22.2
telescope:tags@0.22.2
telescope:theme-base@0.22.2
telescope:theme-hubble@0.22.2
telescope:update-prompt@0.22.2
telescope:users@0.22.2
telescope:api@0.23.0
telescope:comments@0.23.0
telescope:core@0.23.0
telescope:daily@0.23.0
telescope:datetimepicker@0.23.0
telescope:debug@0.23.0
telescope:email@0.23.0
telescope:embedly@0.23.0
telescope:events@0.23.0
telescope:getting-started@0.23.0
telescope:i18n@0.23.0
telescope:invites@0.23.0
telescope:kadira@0.23.0
telescope:lib@0.23.0
telescope:messages@0.23.0
telescope:migrations@0.23.0
telescope:newsletter@0.23.0
telescope:notifications@0.23.0
telescope:pages@0.23.0
telescope:post-by-feed@0.23.0
telescope:posts@0.23.0
telescope:releases@0.23.0
telescope:rss@0.23.0
telescope:scoring@0.23.0
telescope:search@0.23.0
telescope:settings@0.23.0
telescope:share@0.23.0
telescope:singleday@0.23.0
telescope:subscribe-to-posts@0.23.0
telescope:tagline-banner@0.23.0
telescope:tags@0.23.0
telescope:theme-base@0.23.0
telescope:theme-hubble@0.23.0
telescope:update-prompt@0.23.0
telescope:users@0.23.0
templating@1.1.1
tracker@1.0.7
tsega:bootstrap3-datetimepicker@4.14.30_4

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:api",
summary: "Telescope API package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles(['lib/server/api.js', 'lib/server/routes.js'], ['server']);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:comments",
summary: "Telescope comments package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,10 +10,10 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:lib@0.23',
'telescope:i18n@0.23',
'telescope:settings@0.23',
'telescope:users@0.23'
'telescope:lib@0.23.0',
'telescope:i18n@0.23.0',
'telescope:settings@0.23.0',
'telescope:users@0.23.0'
]);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:core",
summary: "Telescope core package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,14 +10,14 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
var packages = [
'telescope:lib@0.23', // no dependencies
'telescope:messages@0.23', // lib
'telescope:i18n@0.23', // lib
'telescope:events@0.23', // lib, i18n
'telescope:settings@0.23', // lib, i18n
'telescope:users@0.23', // lib, i18n, settings
'telescope:comments@0.23', // lib, i18n, settings, users
'telescope:posts@0.23' // lib, i18n, settings, users, comments
'telescope:lib@0.23.0', // no dependencies
'telescope:messages@0.23.0', // lib
'telescope:i18n@0.23.0', // lib
'telescope:events@0.23.0', // lib, i18n
'telescope:settings@0.23.0', // lib, i18n
'telescope:users@0.23.0', // lib, i18n, settings
'telescope:comments@0.23.0', // lib, i18n, settings, users
'telescope:posts@0.23.0' // lib, i18n, settings, users, comments
];
api.use(packages);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:daily",
summary: "Telescope daily view",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,8 +10,8 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:core@0.23',
'telescope:singleday@0.23',
'telescope:core@0.23.0',
'telescope:singleday@0.23.0',
]);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:datetimepicker",
summary: "Custom bootstrap-datetimepicker input type for AutoForm",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-datetimepicker.git"
});
@ -10,7 +10,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
'telescope:core@0.23',
'telescope:core@0.23.0',
'tsega:bootstrap3-datetimepicker@4.14.30_4'
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:debug",
summary: "Telescope debug package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git",
debugOnly: true
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/debug.js'

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:email",
summary: "Telescope email package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-email.git"
});
@ -14,7 +14,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:core@0.23',
'telescope:core@0.23.0',
'sacha:juice@0.1.4'
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:embedly",
summary: "Telescope Embedly module package",
version: "0.23",
version: "0.23.0",
git: 'https://github.com/TelescopeJS/telescope-embedly.git'
});
@ -9,7 +9,7 @@ Package.onUse( function(api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'package-tap.i18n',

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:events",
summary: "Telescope event tracking package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,8 +10,8 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
'telescope:lib@0.23',
'telescope:i18n@0.23'
'telescope:lib@0.23.0',
'telescope:i18n@0.23.0'
]);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:getting-started",
summary: "Getting started posts",
version: '0.23',
version: '0.23.0',
git: "https://github.com/TelescopeJS/telescope-getting-started.git"
});
@ -17,7 +17,7 @@ Package.onUse(function (api) {
// automatic (let the package specify where it's needed)
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
// client

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:i18n",
summary: "Telescope i18n package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use(['telescope:lib@0.23']);
api.use(['telescope:lib@0.23.0']);
api.use(["session"], "client");

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:invites",
summary: "Telescope invites package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-invites.git"
});
@ -17,7 +17,7 @@ Package.onUse(function (api) {
// automatic (let the package specify where it's needed)
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
// client

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:kadira",
summary: "Telescope Kadira package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-kadira.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:core@0.23',
'telescope:core@0.23.0',
'meteorhacks:kadira@2.22.1',
'kadira:debug@2.1.0'
], ['client', 'server']);

View file

@ -5,4 +5,4 @@
Telescope = {};
Telescope.VERSION = '0.23';
Telescope.VERSION = '0.23.0';

View file

@ -1,7 +1,7 @@
Package.describe({
name: 'telescope:lib',
summary: 'Telescope libraries.',
version: '0.23',
version: '0.23.1',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -45,7 +45,7 @@ Package.onUse(function (api) {
'momentjs:moment@2.10.6',
'sacha:spin@2.3.1',
'aslagle:reactive-table@0.8.11',
'utilities:avatar@0.8.3',
'utilities:avatar@0.8.2',
'fortawesome:fontawesome@4.3.0',
'ccan:cssreset@1.0.0',
'djedi:sanitize-html@1.7.0',

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:messages",
summary: "Telescope messages package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-messages.git"
});
@ -9,7 +9,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:lib@0.23']);
api.use(['telescope:lib@0.23.0']);
api.addFiles([
'lib/client/messages.js',

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:migrations",
summary: "Telescope migrations package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -9,7 +9,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/server/migrations.js'

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:newsletter",
summary: "Telescope email newsletter package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-newsletter.git"
});
@ -14,7 +14,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'telescope:core@0.23',
'telescope:core@0.23.0',
'miro:mailchimp@1.1.0',
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:notifications",
summary: "Telescope notifications package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-notifications.git"
});
@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use([
'telescope:core@0.23',
'telescope:core@0.23.0',
'kestanous:herald@1.3.0',
'kestanous:herald-email@0.5.0'
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:pages",
summary: "Telescope static pages package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-pages.git"
});
@ -9,7 +9,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/pages.js'

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:post-by-feed",
summary: "Auto post via RSS to Telescope",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-post-by-feed.git"
});
@ -16,7 +16,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/feeds.js'

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:posts",
summary: "Telescope posts package",
version: "0.22.3",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-posts.git"
});
@ -10,11 +10,11 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:lib@0.23',
'telescope:i18n@0.23',
'telescope:settings@0.23',
'telescope:users@0.23',
'telescope:comments@0.23'
'telescope:lib@0.23.0',
'telescope:i18n@0.23.0',
'telescope:settings@0.23.0',
'telescope:users@0.23.0',
'telescope:comments@0.23.0'
]);
api.addFiles([

View file

@ -36,7 +36,7 @@ Meteor.startup(function () {
importRelease('0.21.1');
importRelease('0.22.1');
importRelease('0.22.2');
importRelease('0.23');
importRelease('0.23.0');
// if this is before the first run, mark all release notes as read to avoid showing them
if (!Events.findOne({name: 'firstRun'})) {

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:releases",
summary: "Show Telescope release notes and phone home with some stats.",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-releases.git"
});
@ -11,7 +11,7 @@ Package.onUse(function (api) {
// --------------------------- 1. Meteor packages dependencies ---------------------------
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
// ---------------------------------- 2. Files to include ----------------------------------
@ -56,8 +56,8 @@ Package.onUse(function (api) {
api.addFiles('releases/0.20.6.md', 'server', { isAsset: true });
api.addFiles('releases/0.21.1.md', 'server', { isAsset: true });
api.addFiles('releases/0.22.1.md', 'server', { isAsset: true });
api.addFiles('releases/0.23.md', 'server', { isAsset: true });
api.addFiles('releases/0.23.md', 'server', { isAsset: true });
api.addFiles('releases/0.22.2.md', 'server', { isAsset: true });
api.addFiles('releases/0.23.0.md', 'server', { isAsset: true });
// i18n languages (must come last)

View file

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

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:scoring",
summary: "Telescope scoring package.",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/scoring.js',

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:search",
summary: "Telescope search package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-pages.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/search.js',

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:settings",
summary: "Telescope settings package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -11,8 +11,8 @@ Package.onUse(function(api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:lib@0.23',
'telescope:i18n@0.23'
'telescope:lib@0.23.0',
'telescope:i18n@0.23.0'
]);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:share",
summary: "Telescope share module package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-share.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/share.js'

View file

@ -1,7 +1,7 @@
Package.describe({
name: 'telescope:singleday',
summary: 'Telescope Single Day package',
version: '0.23',
version: '0.23.0',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -15,7 +15,7 @@ Package.onUse(function (api) {
// --------------------------- 1. Meteor packages dependencies ---------------------------
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
// ---------------------------------- 2. Files to include ----------------------------------

View file

@ -4,9 +4,11 @@ Meteor.startup(function() {
*/
sitemaps.add("/sitemap.xml", function() {
var _getLatest = function(viewParamKey, terms) {
var params = Posts.getSubParams(
Posts.views[viewParamKey.toLowerCase()](terms)
);
var postView = Posts.views[viewParamKey.toLowerCase()];
if (!_.isFunction(postView)) return null;
var params = Posts.getSubParams(postView(terms));
var post = Posts.findOne(params.find, {
'fields': {'postedAt': 1},
'sort': params.options.sort
@ -43,12 +45,12 @@ Meteor.startup(function() {
var siteUrl = Telescope.utils.getSiteUrl();
var params = Posts.getSubParams(Posts.views[key]());
var posts = Posts.find(params.find, {
fields: {postedAt: 1, title: 1, _id: 1},
fields: {postedAt: 1, slug: 1, _id: 1},
limit: 100,
sort: params.options.sort
});
posts.forEach(function(post) {
var url = getPostPageUrl(post).replace(siteUrl, "");
var url = Posts.getLink(post);
postPages[url] = {page: url, lastmod: post.postedAt, changefreq: "daily"};
});
});

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:sitemap",
summary: "Sitemap package for Telescope",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-sitemap.git"
});
@ -10,7 +10,7 @@ Package.onUse(function(api) {
api.versionsFrom("METEOR@1.0");
api.use([
"telescope:core@0.23",
"telescope:core@0.23.0",
"gadicohen:sitemaps@0.0.20"
]);

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:subscribe-to-posts",
summary: "Subscribe to posts to be notified when they get new comments",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-subscribe-to-posts.git"
});
@ -14,7 +14,7 @@ Package.onUse(function (api) {
// automatic (let the package specify where it's needed)
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
// ---------------------------------- 2. Files to include ----------------------------------

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:tagline-banner",
summary: "Show a banner containing your site's tagline on the homepage",
version: "0.23",
version: "0.23.0",
});
Package.onUse(function (api) {
@ -10,7 +10,7 @@ Package.onUse(function (api) {
// --------------------------- 1. Meteor packages dependencies ---------------------------
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
// ---------------------------------- 2. Files to include ----------------------------------

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:tags",
summary: "Telescope tags package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-tags.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/categories.js',

View file

@ -1,14 +1,14 @@
Package.describe({
name: "telescope:theme-base",
summary: "Telescope base theme package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-theme-base.git"
});
Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles(
[

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:theme-hubble",
summary: "Telescope Hubble theme package",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-theme-hubble.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([
'lib/hubble.js',

View file

@ -1,7 +1,7 @@
Package.describe({
name: "telescope:update-prompt",
summary: "Telescope update prompt package.",
version: "0.23",
version: "0.23.0",
git: "https://github.com/TelescopeJS/telescope-update-prompt.git"
});
@ -9,7 +9,7 @@ Package.onUse(function (api) {
api.versionsFrom("METEOR@1.0");
api.use(['telescope:core@0.23']);
api.use(['telescope:core@0.23.0']);
api.addFiles([

View file

@ -1,7 +1,7 @@
Package.describe({
name: 'telescope:users',
summary: 'Telescope permissions.',
version: '0.23',
version: '0.23.0',
git: "https://github.com/TelescopeJS/Telescope.git"
});
@ -10,9 +10,9 @@ Package.onUse(function (api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:lib@0.23',
'telescope:settings@0.23',
'telescope:i18n@0.23'
'telescope:lib@0.23.0',
'telescope:settings@0.23.0',
'telescope:i18n@0.23.0'
]);
api.addFiles([