* master:
Fixing starred stories from not loading past the second page due to a missing flag reset.
Fixing user-found bug around tooltips continuing to show if the original dom element (and the reference to the tooltip) are destroyed too early, leaving a tooltip floating in the air.
Geometrically delaying the fetching of bad feeds, while they're still somewhat fresh.
Fixing error codes on statistics. Also fixing simple error on invalid feed.
Update media/js/newsblur/reader.js
Conflicts:
media/js/newsblur/reader/reader.js
* master:
Re-styling the crap out of all taskbar buttons. Much more streamlined now.
Tweaking the living crap out of the intelligence control's colors. Lightened.
User feedback: hiding positive and negative unread counts in title if there are no unread stories outside of neutral.
Correcting typo in dupe feed resolution.
Local settings in fabfile.
Fixing up a minor detail in the new intelligence control.
Rewriting intelligence slider to be an intelligence control (segmented control). Should make a ton more intuitive sense.
Trying to fix IE troubles by forcing single requests per read story.
Fixing nginx conf to support ssl.
Adding PID files to gitignore.
Ignoring files.
Adding certificates to ignore.
Adding https to nginx.
Conflicts:
media/css/reader.css
media/js/newsblur/common/assetmodel.js
* master:
Adding build/ back to .gitignore.
Updating .gitignore.
Using dsa pem for retrieving rabbit update counts.
Preserving feed fetch error histories for 2 weeks.
Adding munin graph for known good feeds.
Turning down verbosity on feed tasking.
Adding known good feeds to munin to chart their progress.
Fixing headers overflow in Chrome.
Adding new feeds db column 'known_good', for forcing updates of feeds that were once good but are now throwing 500s.
Adding blogging OT press story.
* 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:
Boosting fillout pages.
Small cleanup in ajax manager.
Abort old requests and don't cache responses. Trying to fix IE read story bug.
Force jquery to never cache.
Checking for exceptions earlier in order to show fixed site.
Changing user agent to hopefully override overly-sniffy websites.
Fixing inaccurate substitution on feed urls. Ugh, can't believe this was here this long.
Adding the setting of a feed's view settings to Site Settings dialog. This should've been in there a loooong time ago.
* master: (30 commits)
Boosting fillout pages.
Small cleanup in ajax manager.
Abort old requests and don't cache responses. Trying to fix IE read story bug.
Force jquery to never cache.
Checking for exceptions earlier in order to show fixed site.
Changing user agent to hopefully override overly-sniffy websites.
Fixing inaccurate substitution on feed urls. Ugh, can't believe this was here this long.
Adding the setting of a feed's view settings to Site Settings dialog. This should've been in there a loooong time ago.
Fixing feed loads only once for those with skipping stories.
Adding handler to to_json calls on all serialized models.
Fixing two major bugs: auto filling stories now works far better nad doesn't lock you in. Also fixing the infernal unicode json parsing bug that's been effecting a bunch of sites.
Adding WP7 as user agent.
Adding necessary import when not running from the REPL.
Too many stories? Don't animate transitions when switching intelligence levels.
Fixing typo in iphone app that preventing mark folder as read when the visible stories option was showing.
Updating the mongo db copy util to also look for updated stories.
Globals.is_staff on user, not profile. Make the stats referesh every minute instead of every 10 minutes for staff.
Fixing offsets in river of news.
Adding ciphering to usernames in log, so I can finally take screenshots of the most colorful logs of all time.
Adding my very special mongo serialization backup utility to get around the damn unrepairable mongo database. This is taking 14 hours to run.
...
Conflicts:
templates/base.html
* master: (45 commits)
Launching the iPhone app on the front-page. Big deal.
Minor cleanup of river stories view.
Cleaning up mongoengine imports and settings for default MongoDB.
Killing off the old slave_db pattern.
Moving from slave_db to ReplicaSetConnection in pymongo 2.1.
Adding title and subtitle. (Big thanks to @ericflo for the inspiration.)
Adding title and subtitle. (Big thanks to @ericflo for the inspiration.)
Fitting the iphone web page on smaller screens.
The @jashkenas treatment -- cleaning up the iphone app page.
Adding rotation to iphone website.
Using the correct story permalink (if it is not correctly in the link key of the feed).
Finishign up interaction of iphone app trailer page. Need auto switching.
iPhone screenshots, iPhone page, complete with animations.
Adding current version to iPhone app so it can update from the server.
Removing unnecessary return to selected story on paging of story titles.
Scrolling the story titles view to the feedbar when a page is loading. Experimental, but may help a bunch of users know what's happening.
Stubbing in iphone page.
Solving the Read button dilemma for Everything vs. folders vs. feeds.
Disabling feed settings button on Everything river view.
Building folder delete into iOS app.
...
