* 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
* jammit:
Adding node's 8888 to app ufw. Also adding redis's 6379 to express server.
Adding socket.io-client
Adding node modules.
Retooling fabfile's deploy code to support serial asset packaging with parallel code deploys.
Upgrading nginx version.
Fixing public_root in assets.yml to be readbale by old yml.
Adding static/ to gitignore.
Moving images and theme assets around.
Relative to absolute urls for all embedded images.
Fixing up jammit branch for launch by adding socket.io, bookmarklet, and compressed static assets. Still needs icons.
Fixing css conflicts in jammit. Adding code rendering to jammit for bookmarklet.
Adding /static to nginx conf.
Adding jQuery 1.7 and new static directory.
JS is now complete. Need to fix css embeds.
Initial stub of Jammit assets.
Conflicts:
media/css/reader.css
* 'master' of github.com:samuelclay/NewsBlur: (39 commits)
Adding logging for emails sent. Also using history.replaceState to clear the ?next= parameter.
Adding forgot password email with conveniences.
Seacucumber -> Django-ses. Celery isn't playing well.
Adding seacucumber as a dependency.
Adding android app to email. Also finalizing cleanup.
Finishing up new account email. Adding migration to save email sending preference.
Further fleshing out emails.
Adding autologin (with optout param) for use with emails.
Templating emails -- new account and new premium.
Changing color of logged user agent.
Adding browser user agent to all logging.
Fixing sizing on iphone app's original view's url.
Only active feeds get loaded in the iPhone app. It's about time.
Showing correct story_id in logging for bad read stories.
Showing HUD on logout in iphone app.
Completing the python api.
Showing the correct logging info for mismarked read stories.
Fixing river of new to use new user stories.
Re-running story read migration to account fornew read stories during the migration process.
Adding errors to API/login and API/signup. Getting rid of namespacing on login and signup form fields for api use.
...
Conflicts:
fabfile.py
