Commit graph

1951 commits

Author SHA1 Message Date
Sacha Greif
41e648f7e4 update history 2014-12-27 17:55:48 +09:00
Sacha Greif
4858e178fa fix voting code typo 2014-12-27 12:20:09 +09:00
Sacha Greif
b59ea5ab4f updating meteor 2014-12-27 12:02:01 +09:00
Sacha Greif
87548b4903 Merge branch 'master' of https://github.com/TelescopeJS/Telescope into devel
Conflicts:
	.meteor/versions
2014-12-27 12:01:19 +09:00
Sacha Greif
20ec10809b add limit of 200 posts to avoid DoS problems 2014-12-27 11:56:27 +09:00
Sacha Greif
bf8ced8209 Merge pull request #656 from Kikobeats/patch-1
fixed migrations.js when telescope-tags are removed
2014-12-27 10:26:36 +09:00
Kiko Beats
76ad5b8415 fixed migrations.js when telescope-tags are removed 2014-12-26 19:52:17 +01:00
Sacha Greif
b5f2623907 Merge pull request #655 from shambles/newsletter-comment-fix
Couple of small Newsletter fixes
2014-12-26 10:25:49 +09:00
shambles
731fc5e119 Couple of small Newsletter fixes
1) The route /email/campaign was broken in
ceeb7bf531.  the method
getNextCampaignSchedule() was removed.
e.g. http://meta.telesc.pe/email/campaign
2) The wrong comment count helper was used in the newsletter template
resulting in it being undefined and so you wouldn’t see a count. I’m
guessing this was broken when the post schema was changed as it comes
from a post’s document.
2014-12-26 01:23:23 +00:00
Sacha Greif
b786a7121a fixes 2014-12-24 14:22:45 +09:00
Sacha Greif
f2760f9168 refactoring comment submit method 2014-12-24 10:13:48 +09:00
Sacha Greif
a39569e883 make embedly call async 2014-12-24 09:42:10 +09:00
Sacha Greif
ddf9806c0c Merge pull request #652 from qdsang/patch-1
Update zh-CN.i18n.json
2014-12-24 09:30:36 +09:00
25c29695e6 Update zh-CN.i18n.json 2014-12-23 19:44:11 +08:00
Delgermurun
c37fb7bbd7 add html to .editorconfig 2014-12-22 13:05:16 +08:00
Sacha Greif
a85e09f9ad make post-submit callbacks run on server only 2014-12-22 11:49:35 +09:00
Sacha Greif
4312a39f2a "updateObject" -> "modifier" 2014-12-22 09:50:45 +09:00
Sacha Greif
6fc3bb7092 use type=method for submit and edit forms 2014-12-22 09:49:28 +09:00
Sacha Greif
e5c1b775af make category slug customizable 2014-12-22 09:17:49 +09:00
Ben Gott
7fd5010759 Merge pull request #647 from bengott/avatar-tweaks
Update to bengott:avatar@0.7.3
2014-12-20 14:32:20 -06:00
Ben Gott
b173074551 Update to bengott:avatar@0.7.3 2014-12-20 14:29:14 -06:00
Sacha Greif
24a0f9b830 refactor voting code to accept function calls from server 2014-12-20 17:34:15 +09:00
Sacha Greif
c8ccb8b7b9 updating Meteor 2014-12-20 17:04:45 +09:00
Sacha Greif
d83fa19ed8 add insert allow for feeds 2014-12-19 14:39:43 +09:00
Sacha Greif
d4dcd66a57 using auto form for feeds 2014-12-19 14:32:25 +09:00
Sacha Greif
3d8e6f9237 updating autoform and simpleschema 2014-12-19 11:37:23 +09:00
Sacha Greif
34f092e4b7 using autoform for categories form 2014-12-19 11:37:13 +09:00
Ben Gott
040d3449ae Merge pull request #645 from bengott/avatar-tweaks
Update to bengott:avatar@0.7.2
2014-12-18 20:33:32 -06:00
Ben Gott
6c9329f48e Update to bengott:avatar@0.7.2 2014-12-18 20:30:00 -06:00
Sacha Greif
74b6464530 Merge branch 'master' into devel 2014-12-19 09:05:31 +09:00
Sacha Greif
e934669f4c Merge branch 'master' of https://github.com/TelescopeJS/Telescope 2014-12-19 09:04:40 +09:00
Sacha Greif
84bcc6d5c3 nom package thing 2014-12-19 09:04:33 +09:00
Ben Gott
38d502d09f Merge pull request #644 from bengott/avatar-tweaks
Update to bengott:avatar@0.7.1
2014-12-18 12:38:42 -06:00
Ben Gott
aa91a56a19 Update to bengott:avatar@0.7.1 2014-12-18 12:36:54 -06:00
Sacha Greif
86cfff72d5 clean up 2014-12-18 18:07:04 +09:00
Sacha Greif
0b751d086c working on post-by-feed package 2014-12-18 16:01:18 +09:00
Sacha Greif
8a16e2a01e add thumbnail too if it hasn't been set yet 2014-12-18 15:10:01 +09:00
Sacha Greif
97962562cf make sure post is loaded 2014-12-18 15:09:50 +09:00
Sacha Greif
a6267c69de splitting submitPost into client/server and server functions 2014-12-18 15:09:30 +09:00
Sacha Greif
a379f605cf renaming "rss" to "feed" 2014-12-18 10:47:37 +09:00
Sacha Greif
b7ba4b3bc0 Merge branch 'post-by-rss' of https://github.com/delgermurun/Telescope into delgermurun-post-by-rss
Conflicts:
	.meteor/packages
2014-12-18 10:37:49 +09:00
Sacha Greif
1aa86994f7 using this.autorun 2014-12-18 10:36:41 +09:00
Sacha Greif
4ca3b5aa79 Merge branch 'master' of https://github.com/TelescopeJS/Telescope 2014-12-17 11:43:46 +09:00
Sacha Greif
85acc4fceb only publish the first four commenters 2014-12-17 11:42:08 +09:00
Ben Gott
bf105955e5 Merge pull request #640 from bengott/avatar-tweaks
update to bengott:avatar@0.7.0
2014-12-16 20:38:07 -06:00
Ben Gott
6c27681846 Merge branch 'master' of https://github.com/TelescopeJS/Telescope into avatar-tweaks 2014-12-16 20:28:17 -06:00
Sacha Greif
8be0e828a4 only publish the first four commenters for each post 2014-12-17 11:25:40 +09:00
Ben Gott
61063ca3e1 Update to bengott:avatar@0.7.0 2014-12-16 20:10:46 -06:00
Sacha Greif
9be16ddd41 cleaning up packages file 2014-12-17 11:09:59 +09:00
Sacha Greif
f336d94256 changelog update 2014-12-17 11:05:15 +09:00