Commit graph

162 commits

Author SHA1 Message Date
Samuel Clay
ba48bfb6f5 Including feeds that a user isn't subscribed to in starred stories. 2012-01-27 10:26:52 -08:00
Samuel Clay
8519d68c36 Including feeds that a user isn't subscribed to in social feeds. Also adding a new url for feed icons. 2012-01-26 18:59:40 -08:00
Samuel Clay
fb659b3d6f Social stories feed view nearly finished. Loads, pages, shows stories and shares and comments and stars. Still needs intelligence, better date sorting, and unread counts. 2012-01-26 08:43:46 -08:00
Samuel Clay
f82380c183 Showing social stories feed in reader. Needs unread counts, original view, routing, starred status, among others. 2012-01-25 09:52:34 -08:00
Samuel Clay
b9cf65c834 Merge branch 'master' into social
* master:
  Renaming static.tar to static.tgz to reflect its gzippedness.
  Fixing ghost unread counts on folder when last story in a feed is read.
  Fixing link to scipy-superpack. (Thanks @boursier)
  Handling negative feature page bug. Also showing server errors on bad emails.
  Fixing missing username in dupe USF.
  Handling errors on river in client. Also fixing starred stories.
  Suppressing error on starring an already starred story.
  Re-enabling mobile site. /m/
  Fixing typo in aggressive feed fetching.
  No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh.
  Adding SSL to nginx conf.

Conflicts:
	apps/reader/views.py
	assets.yml
	media/js/newsblur/reader/reader.js
2012-01-23 17:53:59 -08:00
Samuel Clay
d1f5213d33 Adding social subscription relationship. Loading social feeds in with all feeds. Needs to be drawn in feed list. Also needs both original and feed view for social subs. 2012-01-20 09:38:41 -08:00
Samuel Clay
5be8b3c50e Adding a router. Now opening a feed shows up in the browser's address bar. Huge change. Reloading the page also attempts to load the feed. Needs an ajaxy way to load the feed if it isn't in the user's set of feeds. Will be used for social browsing. 2012-01-16 17:55:13 -08:00
Samuel Clay
c0fa6b263e Adding share keys and comment keys to redis, in order to distinguish between the two. 2012-01-13 09:20:37 -08:00
Samuel Clay
3e0a184fc0 Loading public comments through ajax. Needs to remove friends. 2012-01-11 22:01:06 -08:00
Samuel Clay
3a63cd69bf Merge branch 'master' into social
* master:
  Adding error handling for insta-fetching stories.
  Turning off the page fetcher requests vs. urllib2 discrepency checker. I bet I've caught them all by now.
  The @kennethreitz commit: logging all discrepencies between requests and urllib2. This should take a few hours.
2012-01-08 14:15:36 -08:00
Samuel Clay
293474d51c Updating follow profiles during actions. 2012-01-05 20:54:24 -08:00
Samuel Clay
9ea6ee9086 Rearranging javascript. Also backbonizing user models for follower and following collections. 2012-01-04 09:42:35 -08:00
Renamed from media/js/newsblur/assetmodel.js (Browse further)