Commit graph

996 commits

Author SHA1 Message Date
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
Sacha Greif
8906d96e07 Merge pull request #245 from Daltic/update-meteor-version
updated meteor to latest version
2014-02-10 11:32:01 +09:00
Sacha Greif
4693a5e85e Merge pull request #244 from Daltic/sort-categories
categories are sorted by name
2014-02-10 11:31:38 +09:00
Karan Bhangui
834247463f updated meteor to latest version 2014-02-09 14:36:28 -08:00
Karan Bhangui
09f420a070 categories are sorted by name 2014-02-09 14:27:19 -08:00
Sacha Greif
6b00f4402d use spin package instead of including code in the app 2014-02-06 15:45:43 +09:00
Sacha Greif
b20f561e70 Merge pull request #242 from rpullinger/fix-new-posts-checkbox
Fix new post checkbox
2014-02-03 16:46:24 -08:00
Richard Pullinger
e2562cbdf2 Fix new post checkbox
New post checkbox wasn't showing the correct value
2014-02-03 18:26:10 +00:00
Sacha Greif
161709f4f5 Merge pull request #240 from rpullinger/hide-categories-if-not-needed
Only show category list on post submit/edit if there are categories
2014-01-30 16:35:48 -08:00
Richard Pullinger
653d20f487 Only show category list on post submit/edit if there are categories 2014-01-30 19:49:03 +00:00
Sacha Greif
74613c6ed0 Merge pull request #235 from ankurp/master
Best practice to pass object than to check for optional parameter value
2014-01-26 04:37:46 -08:00
Ankur Patel
81ced52a99 Best practice to pass object than to check for optional parameter value 2014-01-25 14:11:26 -05:00
Sacha Greif
b40b8386df replaced click-based click tracking by server-side link redirection; merged both router files 2014-01-18 16:52:12 +09:00
Sacha Greif
b111f2d6af Merge branch 'master' of github.com:SachaG/Telescope 2014-01-18 16:24:54 +09:00
Sacha Greif
52a94a647a search tweaks 2014-01-18 16:24:49 +09:00
Sacha Greif
39a8908e84 Merge pull request #228 from arunoda/fast-render-integration
added fast-render support
2014-01-12 18:22:11 -08:00
Arunoda Susiripala
64a0f7eec2 uses waitOn function in the Router.configure 2014-01-12 23:36:03 +05:30
Arunoda Susiripala
0e57794f47 added complete fast-render support 2014-01-12 22:58:07 +05:30
Sacha Greif
e2eb3548be Merge pull request #227 from yeputons/issue-220
#220: now all pages are waitOn('categories')
2014-01-09 16:49:44 -08:00
Egor Suvorov
89eca55ad3 #220: now all pages are waitOn('categories') 2014-01-10 01:25:25 +02:00
Sacha Greif
bd417016b4 Merge pull request #223 from yeputons/issue-218
#218: post_submit: <input name=category>s are now checkboxes, not radio
2014-01-07 16:00:44 -08:00
Sacha Greif
609a24625f Merge pull request #224 from yeputons/router-access-checks
router.js: all router-level access checks now wait for required subscriptions to be ready instead of hacking around
2014-01-07 16:00:32 -08:00
Egor Suvorov
c5a2a59edc router.js: all router-level access checks now wait for required subscriptions to be ready instead of hacking around 2014-01-07 22:50:56 +02:00
Egor Suvorov
c0f6cb1490 #218: post_submit: <input name=category>s are now checkboxes, not radio 2014-01-07 21:19:08 +02:00
Sacha Greif
fba75e737e Merge pull request #222 from yeputons/issue-217
#217: fixed bug with 'You have to be an admin' message displayed to admins
2014-01-06 15:54:08 -08:00
Sacha Greif
f26544b516 Merge pull request #221 from yeputons/issue-213
#213: symlinks was removed from /packages/ - they should be locally created by Meteorite
2014-01-06 15:53:15 -08:00
Sacha Greif
821d7ab447 Merge pull request #219 from yeputons/issue-194
#194: fixed bug with preserving category name in posts after renaming
2014-01-06 15:48:59 -08:00
Egor Suvorov
088c2a1127 #217: now isAdmin router check call this.subscribe().wait() to avoid showing 'You have to be an admin' message to admins 2014-01-06 21:01:21 +02:00