Commit graph

54 commits

Author SHA1 Message Date
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
52ef153a2d make embedly work for non-admins too 2014-12-06 11:56:57 +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
9bf9ee6f30 renaming embedly package 2014-12-03 08:43:26 +09:00