Commit graph

1525 commits

Author SHA1 Message Date
Sacha Greif
cec0dd5a43 Merge branch 'alert'
Conflicts:
	.meteor/versions
2014-09-16 09:13:24 +09:00
Sacha Greif
8232a2e4b0 set updateVersion to null on startup 2014-09-16 09:12:26 +09:00
Sacha Greif
9222fdc4f9 upgrading to 0.9.2.1 2014-09-16 09:06:09 +09:00
Sacha Greif
f6bf431885 Merge branch 'incoming' of github.com:dburles/Telescope into dburles-incoming 2014-09-15 21:33:36 +09:00
Sacha Greif
25bf032e50 Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-09-15 21:33:19 +09:00
Sacha Greif
e16a0b56c1 finishing work on update package 2014-09-15 21:32:57 +09:00
David Burles
d54bd804e4 added incoming posts notification button 2014-09-15 12:42:17 +10:00
Sacha Greif
70026cfbce Working on update-prompt package 2014-09-13 13:52:29 +09:00
Sacha Greif
d85d65f485 Merge pull request #397 from meteorhacks/allow-images
Allow images in body.
2014-09-13 08:37:24 +09:00
Sacha Greif
c6c73d7115 Merge pull request #396 from jamiewilson/patch-2
Correcting the if statement for profile.site url
2014-09-13 08:36:46 +09:00
Arunoda Susiripala
e820328bbb allow images in body and comments 2014-09-13 04:47:02 +05:30
Jamie Wilson
34f9ffa650 Correcting the if statement for profile.site url
needed to be `profile.site`
2014-09-12 15:52:05 -05:00
Sacha Greif
e26f8dfd11 renaming postMeta template to postInfo 2014-09-12 18:53:49 +09:00
Sacha Greif
ec5d4a1085 Merge pull request #395 from pahans/use-epic-editor-autogrow-feature
Use epic editor autogrow feature
2014-09-12 18:46:00 +09:00
pahans
e03bb1f638 use latest styles from epic editor 0.2.2 2014-09-12 14:51:12 +05:30
pahans
1b13198157 use epic editor autogrow feature 2014-09-12 14:50:13 +05:30
Sacha Greif
adc55cfa42 Merge pull request #394 from pahans/patch-1
update epiceditor to latest(0.2.2) and unminified version
2014-09-12 16:49:38 +09:00
Pahan Sarathchandra
6de9c35cb4 update epiceditor to latest and unminified version
use unminified version of epiceditor because meteor will minify them later anyway.
2014-09-12 13:16:12 +05:30
Sacha Greif
f67ad0b7ae regenerate email hash on profile update 2014-09-12 11:54:04 +09:00
Sacha Greif
67de4f432a Fix gravatar code for good this time (hopefully) 2014-09-12 11:42:44 +09:00
Sacha Greif
866e4f2831 Fixing gravatars 2014-09-12 10:48:21 +09:00
Sacha Greif
127af13e2e Merge pull request #392 from meteorhacks/protocol-specific-urls
use // instead of http:// for images
2014-09-12 07:56:13 +09:00
Sacha Greif
6118ca0f31 Merge pull request #391 from pahans/fix-email-hash-gravatar
fix email hash of gravatar
2014-09-12 07:55:21 +09:00
Arunoda Susiripala
4f6ab74e61 Merge branch 'protocol-specific-urls' 2014-09-11 21:59:41 +05:30
Arunoda Susiripala
9c21aca7d3 added gravatar as well 2014-09-11 21:59:26 +05:30
Arunoda Susiripala
cc0a5e6164 Merge branch 'protocol-specific-urls' 2014-09-11 21:38:38 +05:30
Arunoda Susiripala
31428a8f3d use // instead of http:// 2014-09-11 21:38:32 +05:30
pahans
8054c27d56 fix email hash of gravatar 2014-09-11 16:58:00 +05:30
Sacha Greif
3cc5dd417c same thing for comments 2014-09-11 14:11:41 +09:00
Sacha Greif
bbaa625652 do not insert htmlBody on the client since it's not whitelisted 2014-09-11 14:10:57 +09:00
Sacha Greif
ecfee96f64 Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-09-11 10:34:56 +09:00
Sacha Greif
249f2f75ba digest should not be limited 2014-09-11 10:34:43 +09:00
Sacha Greif
3bc320451a Merge pull request #384 from jamiewilson/patch-1
uncommented and line 18
2014-09-11 08:34:46 +09:00
Jamie Wilson
1a5f13efab uncommented and line 18
and added the return statement!
2014-09-10 18:32:59 -05:00
Sacha Greif
6cf2ad3b92 add current template CSS class 2014-09-11 08:24:29 +09:00
Sacha Greif
02b146df83 reenable facebook avatars 2014-09-10 14:57:01 +09:00
Sacha Greif
71d7859bec Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-09-10 14:39:48 +09:00
Sacha Greif
dec414c64a just use gravatars for now 2014-09-10 14:39:18 +09:00
Sacha Greif
c7096dd447 Merge pull request #380 from bengott/fix-logo-position
Fix header logo position
2014-09-10 09:34:26 +09:00
Ben Gott
9b587fffaa Fix header logo position
logo position was wonky between 30em and 40em screen sizes
2014-09-09 13:36:17 -05:00
Sacha Greif
921424dec3 Merge pull request #378 from raddevon/comments-api
Adds comments to API
2014-09-08 21:30:27 +09:00
Devon Campbell
cd5860ad58 Reverts name of API function to serveAPI 2014-09-08 08:25:07 -04:00
Devon Campbell
51e9ee7c64 Adds comments to API 2014-09-08 08:12:27 -04:00
Sacha Greif
b51785c6ea Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-09-08 17:40:14 +09:00
Sacha Greif
c0dc98f7bf fixing categories 2014-09-08 17:39:59 +09:00
Sacha Greif
27e274c872 working on alert banner 2014-09-08 17:29:55 +09:00
Sacha Greif
06310452d4 Merge pull request #376 from niklasdstrom/remove-unused-signin
Remove unused signin
2014-09-08 14:48:25 +09:00
Niklas Ström
3b1b146bc7 changed the privacyOptions to be a whitelist instead of a blacklist to avoid accidental leak of information. 2014-09-08 13:44:49 +08:00
Niklas Ström
7ea30d173d require user to be admin to listen to allUsers notification 2014-09-08 12:45:29 +08:00
Niklas Ström
e8a895443e Set fromWhere session to return to the current page after successful login.
(eg. if i go to /submit without being logged in, I will be moved to the the login page, and after a successful login i will be transferred back to the submit page)
2014-09-08 02:08:34 +08:00