Commit graph

26 commits

Author SHA1 Message Date
Sacha Greif
82aed922a2 fix mark as read bug 2014-12-01 16:53:41 +09:00
Sacha Greif
b8dc56ea40 Merge branch 'master' into quickform
Conflicts:
	.meteor/versions
	client/views/settings/quickFormSettings.html
	collections/posts.js
	lib/router.js
	packages/telescope-api/versions.json
	packages/telescope-base/versions.json
	packages/telescope-module-embedly/versions.json
	packages/telescope-module-share/versions.json
	packages/telescope-notifications/versions.json
	packages/telescope-rss/versions.json
	packages/telescope-theme-base/versions.json
	packages/telescope-theme-hubble/versions.json
2014-11-26 11:22:54 +09:00
Sacha Greif
0a696ce1e3 internationalizing packages 2014-11-24 11:27:07 +09:00
Sacha Greif
eb082473ed refactor server-side email template routes 2014-11-19 15:14:54 +09:00
Sacha Greif
c335d654c9 fixing missing username in notifications; cleaning up console.logs 2014-11-18 11:00:38 +09:00
Sacha Greif
3141c204c2 tweak commentCount migration; fix kadira version; fix path check 2014-11-18 09:56:09 +09:00
Sacha Greif
4838a04f44 updating packages for IR 1.0 2014-11-17 14:53:42 +09:00
Sacha Greif
0143b8f7de Merge branch 'master' into quickform 2014-10-08 16:13:52 +09:00
Sacha Greif
d277adfc6d wrap newsletter banner helpers in startup block 2014-10-08 11:49:34 +09:00
Sacha Greif
8a72a9b77c Using omit: true 2014-10-06 10:40:45 +09:00
Sacha Greif
ccf0ea7820 working on quick form for post submit 2014-10-05 17:20:15 +09:00
Sacha Greif
f994b0de5e Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-09-30 15:53:44 +09:00
Sacha Greif
9c1e00ac95 Make no_rights and not_found templates customizable 2014-09-30 15:53:36 +09:00
Delgermurun
0ff3fc7dba rename getParameters to getPostParameters 2014-09-29 15:42:35 +08:00
Sacha Greif
0a118cb5c3 Minor form tweaks 2014-09-29 15:40:09 +09:00
Sacha Greif
f00ffd8498 Adding instructions to settings form 2014-09-29 10:15:21 +09:00
Sacha Greif
51de4d79db splitting settings form into field sets 2014-09-28 16:31:12 +09:00
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