9 commits

Author	SHA1	Message	Date
Sacha Greif	64df11d9fe	Merge branch 'master' of github.com:TelescopeJS/Telescope	2014-09-19 20:17:02 +09:00
Sacha Greif	d78cb03b89	fix comment publication bug	2014-09-19 20:00:22 +09:00
Jeremy Shimko	02e0c58580	one more subtract() arg swap	2014-09-18 16:46:40 -04:00
Sacha Greif	7e34caf0eb	Do not mark posts as sent when invoking testCampaign; limit testCampaign to admins	2014-09-18 13:44:50 +09:00
Sacha Greif	ab47ffcc68	Fixing html-to-text bug	2014-09-16 11:51:05 +09:00
Sacha Greif	cec0dd5a43	Merge branch 'alert' ... Conflicts: .meteor/versions	2014-09-16 09:13:24 +09:00
Sacha Greif	02b146df83	reenable facebook avatars	2014-09-10 14:57:01 +09:00
Sacha Greif	27e274c872	working on alert banner	2014-09-08 17:29:55 +09:00
Sacha Greif	733f367f37	add embedly and newsletter packages	2014-08-29 10:37:35 +09:00