Commit graph

1023 commits

Author SHA1 Message Date
Sacha Greif
ba3e5e2ca2 Factoring out the tags/categories feature into its own package 2014-05-09 11:05:33 +09:00
Sacha Greif
c488222b59 Merge branch 'master' of github.com:TelescopeJS/Telescope 2014-05-09 09:40:08 +09:00
Sacha Greif
26cb654bde fixing settings bug 2014-05-09 09:39:49 +09:00
Sacha Greif
485a253002 Merge pull request #278 from ca98am79/fix-comment-downvote
fix for downvoting comments
2014-05-09 09:01:01 +09:00
Mike Carson
2237994555 fix for downvoting comments 2014-05-08 19:35:24 -04:00
Sacha Greif
7f99b09e75 Fixing child comment bug 2014-05-08 15:35:47 +09:00
Sacha Greif
61cf1b6bea Merge branch 'christianbundy-master' into blaze-christian
Conflicts:
	lib/router.js
2014-05-08 15:30:36 +09:00
Sacha Greif
f57c6ab064 Merge branch 'master' of github.com:christianbundy/Telescope into christianbundy-master 2014-05-08 15:28:49 +09:00
Christian Bundy
86ec3ede93 Solve trivial JS errors
Using jshint and and fixmyjs I went through and removed 220 trivial
Javascript errors – mostly missing semicolons, and some properties that
weren’t written in dot notation. You can view the diff of jshint’s
output here:
https://gist.github.com/christianbundy/7b37c51bb6f7c8d739e7/revisions
2014-05-06 20:15:48 -07:00
Sacha Greif
11b4750534 use iron-router-progress 2014-05-07 11:03:53 +09:00
Sacha Greif
65795bcc1f don't throw error for isAdmin hook 2014-05-07 10:57:12 +09:00
Sacha Greif
5a7adbac43 added isReady hook 2014-05-07 10:48:47 +09:00
Sacha Greif
90cd7cdaad updated history.md 2014-05-07 10:23:11 +09:00
Sacha Greif
ec7d5a2996 Made settings fields optional. 2014-05-07 10:09:56 +09:00
Sacha Greif
138abda609 fixed packages 2014-05-07 10:04:37 +09:00
Sacha Greif
21e9a793ac Merge branch 'blaze' into autoforms
Conflicts:
	.meteor/packages
2014-05-07 09:59:00 +09:00
Sacha Greif
ee1c3980ae updating to 0.8.1.1 2014-05-07 09:50:24 +09:00
Sacha Greif
3ed2cca35f Merge branch 'master' into blaze 2014-05-07 09:49:45 +09:00
Sacha Greif
8b6cd26700 Merge branch 'master' of github.com:SachaG/Telescope 2014-05-07 09:49:37 +09:00
Sacha Greif
08d8bd748a Merge pull request #275 from keelhaule/facebook-integration
fixed typo related to profile picture Fetching
2014-05-05 19:48:36 +09:00
Ali Elouafiq
622855bf4b fixed typo related to profile picture Fetching 2014-05-05 10:14:57 +01:00
Sacha Greif
9423401d45 Merge pull request #273 from keelhaule/facebook-integration
Facebook integration
2014-05-05 10:37:28 +09:00
Ali Elouafiq
731723d6c6 integrating Facebook profile picture and fixing Facebook integration issues 2014-05-04 18:48:47 +01:00
Ali Elouafiq
12c18e0119 adding Facebook Login
and a fancy favicon
2014-05-04 17:21:52 +01:00
Sacha Greif
8263575879 removing constant and fixing bugs 2014-05-01 19:58:56 -07:00
Sacha Greif
4e5f26d49c using simpleSchema for settings 2014-05-01 19:34:24 -07:00
Sacha Greif
b10df80e4d adding packages 2014-05-01 13:10:34 -07:00
Sacha Greif
379c002698 working on 0.8 2014-04-30 16:58:11 -07:00
Sacha Greif
0430f9ba20 Merge branch 'master' of github.com:SachaG/Telescope 2014-04-30 15:07:00 -07:00
Sacha Greif
8cdc3fdcfa Merge pull request #271 from gmckeever/master
Added Hack on Nitrous.IO button
2014-04-17 07:06:56 -04:00
Sacha Greif
e1bc962705 Merge branch 'master' of github.com:SachaG/Telescope
Conflicts:
	smart.lock
2014-04-16 12:10:14 +09:00
Sacha Greif
a36e39d251 updating release 2014-04-16 12:09:48 +09:00
Greg McKeever
21aca3907c Added Hack on Nitrous.IO button 2014-04-14 23:46:23 +00:00
Sacha Greif
2e1f61dbf2 Merge pull request #268 from maxwellE/specify_correct_versions_for_meteor_and_iron_router_in_smart_json
specify required versions of iron router and meteor in smart.json
2014-04-07 10:53:55 +09:00
Maxwell Elliott
c5097f8ead specify required versions of iron router and meteor 2014-04-05 12:48:35 -07:00
Sacha Greif
513c3c8481 Merge pull request #264 from paulborza/patch-1
"New Posts" string for en.js was in French
2014-03-24 18:09:56 +09:00
Paul Borza
b48d909218 "New Posts" string for en.js was in French
Perhaps due to a bad merge.
2014-03-23 18:46:50 -07:00
Sacha Greif
f7a133738e Merge pull request #263 from ajduke/master
better redirection,error msg after post is deleted
2014-03-21 02:35:03 +09:00
ajduke
aa6e909590 better redirection,error msg after post is deletd 2014-03-20 23:00:15 +05:30
Sacha Greif
51d0fbd91f Merge pull request #262 from ajduke/master
fixed issue for broken redirection to template after commment deletion
2014-03-20 17:15:03 +09:00
ajduke
e1e4dec278 fixed issue for broken redirection to template after commment deletion 2014-03-20 13:02:07 +05:30
yeputons
e084e2b75f smart.lock: versions of iron-router and fast-render were updated, fixes #259 (compatibility with Meteor 0.7.1) 2014-03-17 16:48:30 +04:00
Sacha Greif
7deb2016f4 Merge pull request #256 from yeputons/issue-255
Fixes #255: now canView do not wait for 'settingsLoaded' which was removed in e622c112
2014-03-03 17:25:54 +09:00
yeputons
959771c6cf Fixes #255: now canView do not wait for 'settingsLoaded' which was removed in e622c112 2014-03-02 20:20:27 +04:00
Sacha Greif
0c8ba253ed remove console.log 2014-02-24 18:42:27 +09:00
Sacha Greif
8bcece0956 encoding url 2014-02-24 18:41:59 +09:00
Sacha Greif
62b7c283f3 Merge branch 'master' of github.com:SachaG/Telescope 2014-02-18 14:47:02 +09:00
Sacha Greif
e622c11286 cleaning up subscriptions 2014-02-18 14:46:53 +09:00
Sacha Greif
6b39013f9e Merge pull request #250 from queso/master
Use the outgoing click tracking for rss
2014-02-18 09:20:36 +09:00
Josh Owens
45d8a1b624 Use the outgoing click tracking for rss
Switch rss to use the outgoing click tracking url for rss.  This makes click tracking via twitter and facebook much easier from an rss share bot.
2014-02-17 12:08:43 -05:00