Vulcan/packages
Sacha Greif ff8bf40694 Merge branch 'telescope-master-semantic-messages' of https://github.com/AdmitHub/Telescope into AdmitHub-telescope-master-semantic-messages
Conflicts:
	client/helpers/handlebars.js
	client/views/comments/comment_edit.js
	client/views/comments/comment_form.js
	client/views/comments/comment_item.js
	client/views/posts/modules/post_upvote.js
	client/views/posts/post_edit.js
	client/views/posts/post_submit.js
	client/views/users/user_edit.js
	client/views/users/user_email.js
	lib/router.js
	packages/telescope-tags/lib/client/views/category_item.js
2014-12-06 17:34:08 +09:00
..
npm-container updating to Meteor 1.0 2014-11-17 09:35:29 +09:00
telescope-api Merge branch 'master' into quickform 2014-11-26 11:22:54 +09:00
telescope-base display future posts in pending view 2014-12-05 08:21:02 +09:00
telescope-blank added blank template for new packages 2014-11-25 16:14:12 +09:00
telescope-daily Merge branch 'master' into quickform 2014-11-26 11:22:54 +09:00
telescope-datetimepicker removing unneeded dependency 2014-12-03 09:04:15 +09:00
telescope-email Merge pull request #587 from anthonymayer/email-header-site-link 2014-12-03 09:25:54 +09:00
telescope-embedly Merge branch 'telescope-master-semantic-messages' of https://github.com/AdmitHub/Telescope into AdmitHub-telescope-master-semantic-messages 2014-12-06 17:34:08 +09:00
telescope-i18n do not make call to CDN when language is english (fix #589) 2014-12-04 11:20:41 +09:00
telescope-kadira Mark some settings field as private and don't publish them 2014-12-04 13:36:06 +09:00
telescope-lib Look for settings in Meteor.settings too (fix #561) 2014-12-04 14:25:51 +09:00
telescope-module-share Merge branch 'master' into quickform 2014-11-26 11:22:54 +09:00
telescope-newsletter Merge branch 'telescope-master-semantic-messages' of https://github.com/AdmitHub/Telescope into AdmitHub-telescope-master-semantic-messages 2014-12-06 17:34:08 +09:00
telescope-notifications Switching from manually generating urls to using IronRouter functions. 2014-12-03 00:06:00 -08:00
telescope-rss Switching from manually generating urls to using IronRouter functions. 2014-12-03 00:06:00 -08:00
telescope-search Switching from manually generating urls to using IronRouter functions. 2014-12-03 00:06:00 -08:00
telescope-tags Merge branch 'telescope-master-semantic-messages' of https://github.com/AdmitHub/Telescope into AdmitHub-telescope-master-semantic-messages 2014-12-06 17:34:08 +09:00
telescope-theme-base Show settings field privacy in admin settings form 2014-12-04 13:36:17 +09:00
telescope-theme-hubble Merge branch 'master' of https://github.com/TelescopeJS/Telescope 2014-12-03 09:04:33 +09:00
telescope-update-prompt Merge branch 'master' into quickform 2014-11-26 11:22:54 +09:00
.gitignore add embedly and newsletter packages 2014-08-29 10:37:35 +09:00