* master:
Adding unique index on MStory.
Quick fix to broken usersubs when changing feed link and address.
Fixing bone-headed issue around renaming folders and having all child folders also renamed (client-side only).
All stories in starred stories view now have a score of 1, so they are always displayed.
* 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:
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.
* feed_settings:
Adding migration for unique hashes on feed addresses + links.
Counting subscribers on branched feeds correctly, so as to maintain update frequency, even though it's branched.
Hooking up feed address change nd branching. Also fixing those infernal feed address change bugs for good.
Finishing up feed_link corrections. Just need feed_address (which is essentially a refactor and abstraction of this feed_link code), and then duplicate UI, which is pretty easy. Yay.
Refactoring feed rewriting to take advantage of new feed link changer. Seems to work. Still needs some better duplicate locking during fetch.
Uniqifying address+link hash. Allowing feed_link branches, but it does not yet work. Needs proper dupe detection.
Beginning new branch feed logic. Needs a huge db migration.
Swapping titles on feed settings when necessary.
Swapping rss and website url.
Stubbing out entire feed settings modal. Needs duplicate feed list. Also needs backend splitting of subscriptions.
Adding feed setting menu item. Cleaning up feed exception dialog.
* master: (48 commits)
Updating copy on homepage.
Marking all as read on Everything view should clear folder unread counts.
Fixing error on committing to cache for rate limits when the dummy cache backend is used.
Adding linux.com story to press page.
Uniqifying stories when read.
Moving from sha module to hashlib.
Syncing time to account for time drift on VPS.
Fixing issue around showing too many Oh Nos on abort.
Save hash for address+link migration. necessary for a unique index.
Deprecating db02, moving redis and rabbitmq over to db01.
Updating nginx conf to support better amintenance pages giving a 503 status code.
Moving NewsBlur counts to beginning of title.
Fixing that crummy missing existing story issue.
Updating feedparser.
Fixing broken hashlib issue with feeds and no link.
Adding MongoDB slave to local_settings template.
Adding two new columns, necessary for the feed_settings branch: hash of address+link, and locking address.
Marking read stories in Feed view as very much read. Gradientizing, too.
Fixing /m/ for no good reason.
File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
...
Conflicts:
config/nginx.newsblur.conf
* master:
Updating copy on homepage.
Marking all as read on Everything view should clear folder unread counts.
Fixing error on committing to cache for rate limits when the dummy cache backend is used.
Conflicts:
templates/reader/feeds.xhtml
* master:
Adding linux.com story to press page.
Uniqifying stories when read.
Moving from sha module to hashlib.
Syncing time to account for time drift on VPS.
Fixing issue around showing too many Oh Nos on abort.
Save hash for address+link migration. necessary for a unique index.
Deprecating db02, moving redis and rabbitmq over to db01.
Updating nginx conf to support better amintenance pages giving a 503 status code.
Moving NewsBlur counts to beginning of title.
* 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:
Adding 'E' as a keyboard shortcut for the Everything view.
Doubling the amount Space pages in a story.
Auto-linkify urls in stories.
Reading stories from slave db during feed update.
Conflicts:
settings.py
* 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.
...
* master: (124 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.
...
