Commit graph

1539 commits

Author SHA1 Message Date
Samuel Clay
e40b93882a Fixing issue around feeds thinking they are unfetched. 2012-06-18 15:59:31 -07:00
Samuel Clay
9c7c943063 Fixing the display of removed comments. 2012-06-07 10:25:15 -07:00
Samuel Clay
6a7bc97033 Fixing river. 2012-06-05 12:23:17 -07:00
Samuel Clay
977109f9aa Loading social feeds is now backbonified. 2012-05-29 11:48:40 -07:00
Samuel Clay
27608f9d6b Fixing classifier training issue. 2012-05-26 22:14:34 -07:00
Samuel Clay
15943bb2b9 Updating read counts and story intelligence status on training. 2012-05-25 22:13:50 -07:00
Samuel Clay
8e1d736095 Delete folder, backboneified. 2012-05-23 21:07:01 -07:00
Samuel Clay
fc817e7048 Cleaning up unfetched feeds and finishing rewrite of refreshing feeds. 2012-05-22 17:39:21 -07:00
Samuel Clay
f969fbf45b Correctly rendering, updating, and flashing changes to feeds. 2012-05-22 15:02:37 -07:00
Samuel Clay
162f979a0a Running through the code searching for every instance of a feed grabbing its attributes in the old-style. 2012-05-21 20:08:27 -07:00
Samuel Clay
9e83d222ec Merge branch 'social' into backbone
* social:
  Web in fabfile only refers to app servers.
  Allowing multiple recipients in emailed stories.
2012-05-21 11:36:23 -07:00
Samuel Clay
2346f43d25 Merge branch 'master' into social
* master:
  Web in fabfile only refers to app servers.
  Allowing multiple recipients in emailed stories.
2012-05-21 11:36:18 -07:00
Samuel Clay
7cdee3b085 Allowing multiple recipients in emailed stories. 2012-05-21 11:29:57 -07:00
Samuel Clay
bfe7ee1634 Initial stab at Backbone-ifying the front-end. Added feed, folder, story, and story_title views with feed, folder, story, and feed_list models. Converted AssetModel to a Router. 2012-05-17 18:40:46 -07:00
Samuel Clay
69bf581cd2 Merge branch 'master' into social
* master:
  Adding story permalink to story context-menu. Thanks to @grammargirl for the idea.
  Adding task servers and updating automated deploy.
  Removing dupe unique index in prep for social.
  Adding 3 new task servers.

Conflicts:
	apps/analyzer/models.py
	fabfile.py
	media/js/newsblur/reader/reader.js
	utils/feed_fetcher.py
2012-05-17 13:27:29 -07:00
Samuel Clay
541121eb83 Removing dupe unique index in prep for social. 2012-05-17 10:52:33 -07:00
Samuel Clay
765443bb9a Adding edit button to story share comments. 2012-05-15 17:56:15 -07:00
Samuel Clay
3a1de9edb8 Fixing recommended friends list. 2012-05-15 17:00:42 -07:00
Samuel Clay
744d186965 Typo 2012-05-15 16:45:16 -07:00
Samuel Clay
874438e893 Handling case of no social friends to follow in recommend friends. 2012-05-15 16:43:53 -07:00
Samuel Clay
5414b4056a Adding recommend users to Friends dialog. 2012-05-15 16:35:09 -07:00
Samuel Clay
9d169f0b97 Fixing sharing and commenting for anonymous users. Also setting all stories to read if a user is not subscribed to it. Useful during a tryfeed view. 2012-05-14 16:43:27 -07:00
Samuel Clay
8907dcb67c Merge branch 'master' into social
* master:
  Fixing OPML import for FastLadder users.
2012-05-14 15:45:29 -07:00
Samuel Clay
05c0d95b81 Fixing OPML import for FastLadder users. 2012-05-14 15:45:25 -07:00
Samuel Clay
dcab6656ae Merge branch 'master' into social
* master:
  Adding tooltip on disabled original page. Thanks to @roycyang for the idea.
  Adding stackexchange to Original blacklist.
2012-05-14 15:27:03 -07:00
Samuel Clay
3b6b503718 Adding stackexchange to Original blacklist. 2012-05-14 15:01:30 -07:00
Samuel Clay
0cdba2ccdf Experimental change: statistics on dashboard now show total for the day. 2012-05-11 09:17:58 -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
77795aa6b7 Adding re-share interaction history. 2012-05-09 14:48:10 -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
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
f1c3c2a575 Calculating social feed scores on follow. Duh. 2012-05-07 17:38:00 -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
e02f3833ce Deleting dupe interactions and activities around follows. 2012-05-03 18:42:32 -07:00
Samuel Clay
1d580554a5 Adding logo to Original blurblogs. 2012-05-02 19:00:17 -07:00
Samuel Clay
86b6788cc2 Merge branch 'master' into social
* master:
  Copying server settings.
  Mongoengine difficulties again, forcing insert on feed pages.

Conflicts:
	fabfile.py
2012-05-02 16:50:48 -07:00
Samuel Clay
b3bbdd6c5c Mongoengine difficulties again, forcing insert on feed pages. 2012-05-02 15:59:06 -07:00
Samuel Clay
dc4cdddf14 Slugifying usernames for use in social urls. 2012-05-02 12:25:17 -07:00
Samuel Clay
571081ae5c Slugifying usernames for use in social urls. 2012-05-02 12:23:12 -07:00
Samuel Clay
9583ccee05 Doh, left in repeat reply interactions. 2012-05-02 12:06:45 -07:00
Samuel Clay
9e4cea939c Changing interactions and activities on comment reply edits. 2012-05-01 18:15:58 -07:00
Samuel Clay
aeb7accab4 Editing of replies. 2012-05-01 18:00:54 -07:00
Samuel Clay
89fb7a37d9 Fixing unread counts when marking stories unread in social subs. 2012-04-30 13:45:09 -07:00
Samuel Clay
64159c363c Fixing mark_as_unread for social feeds which the user does not subscribe. 2012-04-30 13:26:20 -07:00
Samuel Clay
b417dc44a0 Preventing infinite loops on native re-shares. 2012-04-30 13:22:59 -07:00
Samuel Clay
7770e131f2 Showing re-shares. Ship it. 2012-04-30 13:05:14 -07:00