Commit graph

1967 commits

Author SHA1 Message Date
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
Samuel Clay
8ab5843a66 Adding error handling and messaging to both shared stories button and to comment replies. 2012-04-23 11:26:36 -07:00
Samuel Clay
a23bb0c17a Allowing clicks on an already selected site. Updating feed counts inline when sent from server. Fixing bug around refreshing feeds. 2012-04-21 23:00:51 -07:00
Samuel Clay
45b2b06c10 Adding share rainbow to story titles. Thanks Talha Mansoor (@talha131) 2012-04-21 21:50:27 -07:00
Samuel Clay
74bb4780ea Adding dashboard date and auto-highlighting new interactions, to be cleared on dashboard view. 2012-04-21 18:20:49 -07:00
Samuel Clay
cb1f2a75d3 Adding resize to profile modal during follow/unfollow. 2012-04-21 16:42:59 -07:00
Samuel Clay
df8a67434f Updating followers in profile when following/unfollowing. 2012-04-21 16:14:53 -07:00
Samuel Clay
deff56dc76 Fixing username changes. 2012-04-20 08:45:29 -07:00
Samuel Clay
bef8fbd6ee Fixing broken cancel button on send email dialog. 2012-04-20 08:39:40 -07:00
Samuel Clay
0b71211090 Fixing broken River. 2012-04-20 08:15:16 -07:00
Samuel Clay
28d6226e72 Fixing recommended feeds. 2012-04-19 22:43:07 -07:00
Samuel Clay
d96ed5db54 Big change to tryfeed. Handling sites that the user isn't subscribed to now downloads them successfully. Useful for sharing stories on feeds you do not subscribe to. 2012-04-19 22:38:00 -07:00
Samuel Clay
2205814f2a Adding public user activity to social profile. 2012-04-19 19:09:31 -07:00
Samuel Clay
2aea457455 Marking socialsubs with same shared stories as dirty to recount. Also scrolling down to comments from activities. 2012-04-19 15:01:01 -07:00
Samuel Clay
4d2e8fa9bc Adding View Profile menu item to social subs. 2012-04-17 15:37:01 -07:00
Samuel Clay
a98e8fadde Forcing heights for friends and profiles. Resizing as necessary. 2012-04-17 15:20:21 -07:00
Samuel Clay
31d18752f2 Merge branch 'master' into social
* master:
  Changing the color of sql duration times in debug logging. Yeah, nobody but me will see this, but boy is it pretty. Ask me sometime and I'd love to show you my insanely colorful logs.
  Correctly handling story that lack titles but have content. Using a parsed and shucked truncation of content in place of missing titles.
  Sanity check on deleted feeds.
  Read it Later -> Pocket
  Read it Later -> Pocket

Conflicts:
	media/js/newsblur/reader/reader.js
2012-04-17 12:12:41 -07:00
Samuel Clay
4baa6b68db Sanity check on deleted feeds. 2012-04-17 11:18:34 -07:00
Samuel Clay
ab6e57b227 Read it Later -> Pocket 2012-04-17 11:01:52 -07:00
Samuel Clay
ca5b7cffd8 Read it Later -> Pocket 2012-04-17 10:58:32 -07:00
Samuel Clay
aa42f098cf Adding a ton of activities. Fixing numerous bug saround interactions. 2012-04-16 11:21:52 -07:00
Samuel Clay
3f991ca2a0 Automatically showing interactions/activities modules when new info is made, even if they are empty to begin with. 2012-04-12 17:41:33 -07:00
Samuel Clay
1f0ff36ba6 Auto-refreshing activities and interactions. 2012-04-12 15:19:26 -07:00