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
..
mobile	Fixing /m/ for no good reason.	2011-11-15 18:23:16 -08:00
newsblur	Merge branch 'master' into social	2012-01-23 17:53:59 -08:00
vendor	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