* 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
* master:
Fixing #42: a long-time bug of drag-and-drop not respecting order.
Removing application media types from enclosures. Nobody needs that.
Forcing Jammit asset path to be absolute, relative to configured directory.
Conflicts:
media/js/newsblur/reader/reader.js
utils/story_functions.py
* master:
Minor changes to fabfile. Needs to only run the pre_deploy step once.
Adding uglify-js.
Fixing paypal return.
Fixing default state while waiting for statistics data to come in.
Adding feed update interval for non-premium users in Statistics.
Adding Chrome Notifier to Goodies page.
Adding Tumblr to share menu.
Ordering unmoderated recommended feeds by date.
Conflicts:
utils/json_functions.py
* 'master' of github.com:samuelclay/NewsBlur:
Adding 'a' keyboard shoftcut to open the add site dialog.
Changing the hiding/showing of saved star in hopes tha tit fixes the persistent display bug.
Fixing broken opml export due to missing feed icons.
Fixing slight bug in how active premiums were applied to feed update times.
Shift+U switches between read and unread. Thanks to @MLACitation: https://twitter.com/mlacitation/status/155371014560288768
* master:
Fixing broken opml export due to missing feed icons.
Fixing slight bug in how active premiums were applied to feed update times.
Shift+U switches between read and unread. Thanks to @MLACitation: https://twitter.com/mlacitation/status/155371014560288768
Adding active_premium count. Setting a minimum of 1 hour fetches for feeds with any active premiums.
Allowing username refinement in fetching starred stories.
Increasing timeout on gunicorn to 2 min.
Adding management command to fetch starred stories on command.
* master:
Adding active_premium count. Setting a minimum of 1 hour fetches for feeds with any active premiums.
Allowing username refinement in fetching starred stories.
Increasing timeout on gunicorn to 2 min.
Adding management command to fetch starred stories on command.
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.
* 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.
