Commit graph

3167 commits

Author SHA1 Message Date
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
1a31ac4b81 Merge branch 'master' into social
* master:
  Initial stab at spec for Android app. Feel free to comment on expected features.
2012-05-10 17:38:04 -07:00
Samuel Clay
c433dba535 Initial stab at spec for Android app. Feel free to comment on expected features. 2012-05-10 17:37:24 -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
96fcc65afe Removing dependency on original story when replying. 2012-05-10 08:30:34 -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
0aaef3ed75 Merge branch 'social' of github.com:samuelclay/NewsBlur into social
* 'social' of github.com:samuelclay/NewsBlur:
  Fixing bug around missing feed links being checked for broken pages.
2012-05-09 11:46:02 -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
c729ec6550 Merge branch 'master' into social
* master:
  Fixing bug around missing feed links being checked for broken pages.
2012-05-08 10:20:03 -07:00
Samuel Clay
d4322148e2 Fixing bug around missing feed links being checked for broken pages. 2012-05-08 10:19:46 -07:00
Samuel Clay
e73ed62d38 Merge branch 'master' of github.com:samuelclay/NewsBlur
* 'master' of github.com:samuelclay/NewsBlur:
  Don't know how I feel about this change, but http://gizmodo.com/author/mat-honan.xml is failing when 'Safari/X' is in the user agent, but only with http opener. Ugh.
  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.
  Fixing keyboard dialog.
  New preference: delay to mark a story as read.
  Closing #52: Adding delicious to sharing services and preferences. Thanks @palewire for the suggestion.
  db02 -> db01.
  db01 -> db02
  Adding backup restore for psql.
  Adding NEWSBLUR.reader.count_unreads_across_all_sites()
  Copying server settings.
2012-05-08 10:18:31 -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
f1c3c2a575 Calculating social feed scores on follow. Duh. 2012-05-07 17:38:00 -07:00
Samuel Clay
d9d7ed279a Merge branch 'master' into social
* master:
  Don't know how I feel about this change, but http://gizmodo.com/author/mat-honan.xml is failing when 'Safari/X' is in the user agent, but only with http opener. Ugh.

Conflicts:
	utils/feed_fetcher.py
2012-05-07 17:17:12 -07:00
Samuel Clay
852202899d Don't know how I feel about this change, but http://gizmodo.com/author/mat-honan.xml is failing when 'Safari/X' is in the user agent, but only with http opener. Ugh. 2012-05-07 17:16:32 -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
fd8b19d675 Merge branch 'master' into social
* master:
  Fixing keyboard dialog.

Conflicts:
	media/js/newsblur/reader/reader_keyboard.js
2012-05-07 15:27:19 -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
0dee27f4d8 Adding postgresql config to fab script. Also adding SHMMAX setting. 2012-05-04 13:37:01 -07:00
Samuel Clay
bc529ef99f Merge branch 'master' into social
* master:
  db02 -> db01.
2012-05-03 19:09:42 -07:00
Samuel Clay
7f7887c680 db02 -> db01. 2012-05-03 19:09:36 -07:00
Samuel Clay
8142087a49 Merge branch 'master' into social
* master:
  db01 -> db02
2012-05-03 18:51:44 -07:00
Samuel Clay
8f28e8e52e db01 -> db02 2012-05-03 18:51:40 -07:00
Samuel Clay
e02f3833ce Deleting dupe interactions and activities around follows. 2012-05-03 18:42:32 -07:00
Samuel Clay
a428765b1e Merge branch 'master' into social
* master:
  Adding backup restore for psql.
2012-05-03 18:33:36 -07:00
Samuel Clay
5f167251bb Adding backup restore for psql. 2012-05-03 18:33:29 -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