Commit graph

2339 commits

Author SHA1 Message Date
Samuel Clay
3eed5f8eaa Adding tooltip on disabled original page. Thanks to @roycyang for the idea. 2012-05-14 15:26:56 -07:00
Samuel Clay
3b6b503718 Adding stackexchange to Original blacklist. 2012-05-14 15:01:30 -07:00
Samuel Clay
7c6a94ee72 Inverting manage menu to place highly used items at bottom, closer to the mouse. Also fixing closing of manage menu when clicking on the button twice. 2012-05-11 10:06:05 -07:00
Samuel Clay
0af7bf2c99 Further refining and fixing links in interactions and activities modules. 2012-05-10 22:29:23 -07:00
Samuel Clay
142bfa724c Fixing broken interaction. 2012-05-10 22:11:06 -07:00
Samuel Clay
b2d34d5dd3 Merge branch 'social' of github.com:samuelclay/NewsBlur into social
* 'social' of github.com:samuelclay/NewsBlur:
  Fixing blurblog preview, using fetched blurblog title when not available, styling on Friends.
  Removing dependency on original story when replying.
2012-05-10 15:34:53 -07:00
Samuel Clay
ae3c9faf1e Updating dashboard social counts. 2012-05-10 15:34:32 -07:00
Samuel Clay
be479b46b6 Fixing blurblog preview, using fetched blurblog title when not available, styling on Friends. 2012-05-10 09:45:07 -07:00
Samuel Clay
bb3c4e9575 Fixing bug on interactions module linking to wrong blurblog. It should link to the original commenter's blurblogs, not the replier's. 2012-05-09 21:11:48 -07:00
Samuel Clay
a200a9db2d Fixing 'n' key to work with social feeds. Also scrolling feed list to follow selected site. 2012-05-09 17:06:02 -07:00
Samuel Clay
b9fdf5e885 Merge branch 'master' into social
* master:
  Immediately marking story as read when sending it to a service or opening in a new tab. Thanks to Jonas for the suggestion.
2012-05-09 16:14:11 -07:00
Samuel Clay
f6e0933f78 Immediately marking story as read when sending it to a service or opening in a new tab. Thanks to Jonas for the suggestion. 2012-05-09 16:14:05 -07:00
Samuel Clay
77795aa6b7 Adding re-share interaction history. 2012-05-09 14:48:10 -07:00
Samuel Clay
e44ccc355e Embiggening twitter profile photos in profile dialog. 2012-05-09 13:51:48 -07:00
Samuel Clay
783133fa02 Changing real-time text. Fixing weird css layout issue. 2012-05-09 12:26:34 -07:00
Samuel Clay
1d91cb1a6c Merge branch 'master' into social
* master:
  Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance.

Conflicts:
	media/js/newsblur/reader/reader_utils.js
2012-05-09 12:11:58 -07:00
Samuel Clay
a823b1bdae Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance. 2012-05-09 12:11:23 -07:00
Samuel Clay
35730d49e4 _.includes to _.string.contains. 2012-05-09 12:11:04 -07:00
Samuel Clay
48d6ce665f Merge branch 'master' into social
* master:
  Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance.
2012-05-09 12:09:27 -07:00
Samuel Clay
0ed996dcf3 Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance. 2012-05-09 12:09:23 -07:00
Samuel Clay
0856c423e4 Changing real-time labels on dashboard. 2012-05-09 11:45:52 -07:00
Samuel Clay
8814df61be Fixing long-standing social bug: when following users who have not shared stories yet, update their social feed for followers when they eventually do share a story. No page refresh necessary. 2012-05-08 18:34:48 -07:00
Samuel Clay
e4089db393 Refactoring parameters of update_read_count. Was going to use this as an opportunity to fix the bug around reading a story shared in multiple blurblogs, but it can't be done client-side. Moving to server-side solution. 2012-05-07 18:24:05 -07:00
Samuel Clay
58591e5022 Merge branch 'master' into social
* master:
  Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view.

Conflicts:
	media/css/reader.css
2012-05-07 16:27:55 -07:00
Samuel Clay
1bb442a9d0 Being much more aggressive about certain sites trying to take over the iframe. Blocking nytimes.com, twitter.com, and stackoverflow.com from even allowing an Original view. 2012-05-07 16:26:31 -07:00
Samuel Clay
f683d9bd26 Fixing keyboard dialog. 2012-05-07 15:26:33 -07:00
Samuel Clay
b04884fc31 Fixing keyboard dialog. 2012-05-07 15:25:20 -07:00
Samuel Clay
c6dda3744d Merge branch 'master' into social
* master:
  New preference: delay to mark a story as read.
  Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion.

Conflicts:
	media/css/reader.css
	media/js/newsblur/reader/reader.js
	media/js/newsblur/reader/reader_keyboard.js
2012-05-07 15:23:56 -07:00
Samuel Clay
d17dc14a05 New preference: delay to mark a story as read. 2012-05-07 15:13:02 -07:00
Samuel Clay
8791291774 Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion. 2012-05-06 16:26:54 -07:00
Samuel Clay
8c612aa0e7 Fixing opening tryfeeds when they have been opened before. 2012-05-04 15:49:39 -07:00
Samuel Clay
fa69eaa09d Linkifying Site header in Feed view. 2012-05-04 15:27:53 -07:00
Samuel Clay
5d5eb2e8c9 Merge branch 'master' into social
* master:
  Adding NEWSBLUR.reader.count_unreads_across_all_sites()
2012-05-03 13:45:05 -07:00
Samuel Clay
740cba1586 Adding NEWSBLUR.reader.count_unreads_across_all_sites() 2012-05-03 13:45:00 -07:00
Samuel Clay
b0904ea0b3 Hiding context menu on sucessful share. 2012-05-02 13:29:17 -07:00
Samuel Clay
3a05ccc118 Fixing sharing by checking for active feed to re-share. 2012-05-02 13:23:54 -07:00
Samuel Clay
c19e068262 Merge branch 'master' of github.com:samuelclay/NewsBlur into social
* 'master' of github.com:samuelclay/NewsBlur:
  Truncating feed title in trainer dialog.
  Adding French review to press page.

Conflicts:
	media/js/newsblur/reader/reader_classifier.js
2012-05-02 12:08:08 -07:00
Samuel Clay
48be6d798d Truncating feed title in trainer dialog. 2012-05-02 09:34:13 -07:00
Samuel Clay
aeb7accab4 Editing of replies. 2012-05-01 18:00:54 -07:00
Samuel Clay
7770e131f2 Showing re-shares. Ship it. 2012-04-30 13:05:14 -07:00
Samuel Clay
25fce20e07 Fixing bug to allow URLs to be passed around, evne if the user doesn't follow the blurblog. 2012-04-30 12:20:04 -07:00
Samuel Clay
71937f92d1 Adding shift+s and ctrl+enter to share and submit a story. 2012-04-27 17:44:00 -07:00
Samuel Clay
ffaa20be66 Merge branch 'master' into social
* master:
  Adding send raw email link to Email Dialog. Thanks to @tylast for the idea.

Conflicts:
	media/js/newsblur/reader/reader_send_email.js
2012-04-25 18:19:26 -07:00
Samuel Clay
48d6633368 Adding send raw email link to Email Dialog. Thanks to @tylast for the idea. 2012-04-25 17:15:11 -07:00
Samuel Clay
7f3ec48665 Cleanup. 2012-04-25 12:18:26 -07:00
Samuel Clay
34083085cf Sorting social feeds according to preferences. 2012-04-24 13:18:08 -07:00
Samuel Clay
409bea653d Use Feed view as default for shared stories. Original view just isn't done yet. 2012-04-24 11:45:32 -07:00
Samuel Clay
139761a148 Adding share story menu option to story context menu. Took all day. 2012-04-24 10:38:23 -07:00
Samuel Clay
eb77b1e34d Merge branch 'master' into social
* master:
  Upping refresh interval a bit since every 6 seconds is a bit too much when importing new feeds.

Conflicts:
	media/js/newsblur/reader/reader.js
2012-04-23 17:03:17 -07:00
Samuel Clay
599a9ffc82 Upping refresh interval a bit since every 6 seconds is a bit too much when importing new feeds. 2012-04-23 17:02:50 -07:00