* 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.
...
* master:
Fixing bogus type error, caused by duplicate feeds.
Correcting styling on site settings loader icon.
Removing dupe migration from feed_settings.
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Fixing #41: Adding REDIS to local_settings.py.template.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Switching to requests from urllib2/httplib. Bring on the page errors.
Adding a bunch fo keyboard shortcuts.
Adding elapsed time field to river and feed view.
Fixing autolinking of text links to no longer indiscriminately replace text, causing double encoding of html entities.
Fixing the space bar key to not queue, so it's actually useful now!
Refining media enclosures by adding all types and linking to their source.
Refining media enclosure detection.
Conflicts:
config/nginx.newsblur.conf
* master:
Fixing /m/ for no good reason.
File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
Fixing missing stories being updated bug.
Fixing issues around embedded content. Santizing HTML, but =preserving embed, object, and params.
* master:
Adding iphone icon as a logo that I can submit to sites.
Brief cleanup.
Finished suggestion to add unread counts to window title. Now a preference.
Adding color transform to read stories in Feed view.
As per a suggestion, making the max-width of the Feed view set to 700px. Great idea.
Fixing bug in send_story_email -- newlines in the subject line. Doh. Also adding story_Date to read_stories, in the hopes it could fix another bug for bad unread counts.
Fixing issues around broken existing stories on secondary vs primary.
Fixing mark_feed_stories_as_read, and fixing a bad MStory query.
Finishing the revamping mark as read button. Now confirms, as well as allows choice between entire feed/folder or just visible stories.
Adding bullshit user agent string because some sites are sniffing for browsers in order to serve the correct site.
Swapping out Instapaper and Email.
Separating out mark read button in iOS app to be for either visible stories or all stories. Needs hookups for visible stories and folders.
* master: (23 commits)
Adding mark_story_as_unread to API. Now works flawlessly up to settings.DAYS_OF_UNREAD (currently 2 weeks).
Rate limit starts at 0.
Fixing cache add using the correct API.
Fixing cache for ratelimiting.
Rate limiting /reader/feeds and /reader/refresh_feeds.
Move folder to folder now complete. Ready to launch!
Moving feed to folder, end-to-end. Just needs move folder to folder.
Adding Google+ and Pinboard to sharing tools.
Toning down updates on infrequently updated feeds.
Adding update_counts to /feeds API endpoint, to force a recalculation of feed unread counts (WARNING: slower than calling /feeds then /refresh_feeds).
Finishing up realtime for testing on prod.
Adding fabfile config for redis.
Adding 'E' as a keyboard shortcut for the Everything view.
Doubling the amount Space pages in a story.
Auto-linkify urls in stories.
Preparing realtime for deployment.
Adding socket.io communication and feed updating on client-side. Ready to ship?
Adding server half of redis real-time unread count updates. That was the easy part.
Adding new API endpoint: mark_feed_stories_as_read. Refactored mark_story_as_read.
Fixing issue for single story preference users: When in page view and story is not found, clicking on other stories in story titles doesn't udpate Feed view. I can't imagine how few users this actually impacts, but it's now fixed.
...
* master:
Adding Google+ and Pinboard to sharing tools.
Toning down updates on infrequently updated feeds.
Adding update_counts to /feeds API endpoint, to force a recalculation of feed unread counts (WARNING: slower than calling /feeds then /refresh_feeds).
Finishing up realtime for testing on prod.
Adding fabfile config for redis.
Adding 'E' as a keyboard shortcut for the Everything view.
Doubling the amount Space pages in a story.
Auto-linkify urls in stories.
Preparing realtime for deployment.
Adding socket.io communication and feed updating on client-side. Ready to ship?
Adding server half of redis real-time unread count updates. That was the easy part.
Adding new API endpoint: mark_feed_stories_as_read. Refactored mark_story_as_read.
Fixing issue for single story preference users: When in page view and story is not found, clicking on other stories in story titles doesn't udpate Feed view. I can't imagine how few users this actually impacts, but it's now fixed.
Fixing Paypal issue around not defaulting to .
Reading stories from slave db during feed update.
* master: (52 commits)
Adding mark all as read action sheet for river of news in ios. Still needs hookup + server.
Adding method param error to /api/login and /api/signup.
Adding method param error to /api/login and /api/signup.
Fixing stale unread counts on feed list in iOS app when returning from river.
Saving duplicate read stories correctly.
Fixing gradient in story detail view in iOS.
Adding pages_fetched to munin.
New keyboard shortcut: m finds the oldest unread story.
Fixing exception when deleting bad user subs.
Skip broken classifiers when saving.
Speeding feed fetching back up.
Adding new db03 to mongodb mix.
Using mongodb nifty db resolution.
Testing out a slave read for getting stories.
Putting a time limit on collect_stats.
Simplifying the shit out of feed fetch histories.
Simplifying the shit out of feed fetch histories.
Trying to fix fetch histories with indexes. Also upating fabfile.py
Spreading out feed refreshing to the max.
Slowing down refreshed.
...
