Commit graph

55 commits

Author SHA1 Message Date
Anthony Mayer
f9d9891fba Getting rid of redundant permissions functions
Switched everything over to use can.* functions from telescope-lib instead of using can* functions from lib/permissions.js, deleted lib/permissions.js, added some tests for permissions, and some other random cleanup like deleting unused code.

Conflicts:
	client/views/comments/comment_form.js
2015-01-07 08:22:46 +01:00
Sacha Greif
37ab8d48b9 feeds require to be enabled 2014-12-31 11:54:38 +09:00
Sacha Greif
0d983355eb refactor banner CSS; add dismiss button to release notes banner 2014-12-31 11:44:32 +09:00
Sacha Greif
778c08d544 clean-up 2014-12-30 18:18:00 +09:00
Sacha Greif
0cc668ce05 add setting for enabling newsletter 2014-12-30 13:46:48 +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
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
3d8e6f9237 updating autoform and simpleschema 2014-12-19 11:37:23 +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
ceeb7bf531 clean up newsletter cron code 2014-12-17 11:00:59 +09:00
Delgermurun
f40be395a3 Fixes scheduling cron jobs twice 2014-12-14 19:46:32 +08:00
Sacha Greif
1eb72079b4 adding userCreatedCallbacks callback hook and refactoring user creation 2014-12-13 14:02:45 +09:00
Sacha Greif
987696657d upgrade to meteor 1.0.1 2014-12-10 09:37:57 +09:00
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
Sacha Greif
1795552287 Mark some settings field as private and don't publish them 2014-12-04 13:36:06 +09:00
Sacha Greif
82aed922a2 fix mark as read bug 2014-12-01 16:53:41 +09:00
Sacha Greif
d2b24794bc working on form i18n 2014-11-30 12:36:56 +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
a3c5c0a4c4 updating tap:i18n 2014-11-25 08:56:29 +09:00
Sacha Greif
42aa4bd0d9 use zh-CN as code for Chinese 2014-11-24 11:38:57 +09:00
Sacha Greif
0a696ce1e3 internationalizing packages 2014-11-24 11:27:07 +09:00
Sacha Greif
f3ddf53cf7 updating package versions 2014-11-20 10:44:08 +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
73cb59a088 Working on IR 1.0 update 2014-11-17 11:01:37 +09:00
Sacha Greif
0ceda58124 updating to Meteor 1.0 2014-11-17 09:35:29 +09:00
Charlie DeTar
ea7efc3550 Replace "throwError" with "flashMessage" and type
Currently, ``throwError`` is used for all manner of messages, including
errors, "success" messages, and "info" messages.  This makes appropriate
styling of the error message difficult.  In addition, the name
``throwError`` seems to create confusion, implying that an error will
actually be thrown (e.g. stopping execution when a user isn't logged in
[0][1]), when in fact it just displays a message.

Replace ``throwError`` with ``flashMessage``, and reliably include a
message "type" (e.g. "error", "success", "info") every time.  rename
``lib/errors.js`` to ``lib/messages.js`` to more accurately reflect its
function.

This commit doesn't rename the message collection (``Errors``), nor the
template responsible for rendering the messages (``error_item.html``) --
that should probably still be done, but has higher likelihood of
trouble for existing alternate themes and installations.

[0] 6ccf7d7d47/client/views/users/user_edit.js (L43)
[1] 083a4c4dc4/client/views/users/user_email.js (L13)
2014-11-05 13:12:09 -07: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
c5b2c36758 Using omit: true 2014-10-06 10:23:46 +09:00
Sacha Greif
cd1496897d updating packages 2014-10-05 17:23:05 +09:00
Sacha Greif
ccf0ea7820 working on quick form for post submit 2014-10-05 17:20:15 +09:00
Sacha Greif
f5c4908d12 Upgrading to 0.9.3.1 2014-10-04 12:51:44 +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
95a2157768 updating meteor 2014-09-26 12:03:59 +09:00
Sacha Greif
64ba9fe0f3 security fix 2014-09-23 11:30:21 +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