* master:
Moving classifiers when recreating destroyed feeds.
Code to recreateaccidentally destroyed feeds.
Adding SSL certificate assembly fab command.
Skip saved feeds which have fake unread counts.
Fixing saved story view for users with preference to open first unread story, thereby switching them out of saved mode and into unread mode.
Adding copy_db_settings to fabfile.
Fixing specified image sizes.
Only premiums users can share multiple stories from a single feed per day.
Faster delete user (for combating spam).
Boosting XL font size.
* master: (492 commits)
Fixing renewal dialog.
Better feed count for muting.
Preventing dupe stories in feed view.
Adding mute feeds feature for premium users.
Adding auto-activate for flat feeds.
Submitting v4.1.0.
Last beta of ios 4.1 before release.
Showing refresh notifier when returning to app.
Fixing urls for folders with dashes in the title.
Removed transition.
Transitioning from tag to tag/feed_id.
Max of 3 updates per fetch.
Upgrading mongodb mms agent.
Showing saved stories explainer for empty saved stories.
Removing mark read button in story titles bar when on saved view.
Fixing updates_off in tasks.
Adding updates_off run-time setting for handling large spikes of updates.
Draining feeds also clears out error feeds.
Fixing errors with missing story content from ifttt.
OMG, I shipped a 3 second sleep. Doh!
...
Conflicts:
apps/reader/models.py
* master: (78 commits)
Adding 401 status code for invalid token on user/info.
Adding new preference for 24 hour clock. Moving to client-side generated dates.
Adding IFTTT logging.
All dates in iso 8601 format.
Use strings for feed_id.
Fixing unread trigger for IFTTT.
Updating shared story ifttt entries.
Fixing ReadKit flat folders by leaving out removed feeds.
Adding handlers for all stories.
Fixing ifttt timestamp.
Adding share story action for IFTTT.
Adding site title, website, and address to each IFTTT trigger.
Adding share username to ifttt share trigger.
Upping access token expiration to 10 years.
Using TitleCase instead of snake_case.
Fixing exception dialogs to correctly update on fixed addresses and links.
New saved story as per IFTTT action.
Updating IFTTT urls.
IFTTT action for new subscriptions.
Adding folder list for dynamic action fields.
...
* master: (335 commits)
Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story.
Fixing bug on empty river.
Use the selected feed view when viewing a story
Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories.
Fixing accidental truncation on story when saved.
Fixing story detail height in Text view when saved with tags.
Fixing text tab view.
Updating readability.
Using https for twitter images. Adding a twitter photo sync to fix broken twitter photos. Thanks to @ggrappone for finding this one.
Counting dupe feeds only once in unread counts.
Fixing bookmarklet for NYTimes. Thanks to @rafeco for catching the bug.
Fixing bounce on resize.
disable debug
Mark-read idempotency for social feeds. (#460)
Idempotent mark-as-read DB ops. (#460)
Cleaning up unread counting. (#460)
Fixing height issues with new saved stories sideoptions box.
Limiting new user queue.
Limiting new user queue.
Max overlay fully fade slightly sooner when scrolling down. (#459)
...
* master: (292 commits)
Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story.
Fixing bug on empty river.
Use the selected feed view when viewing a story
Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories.
Fixing accidental truncation on story when saved.
Fixing story detail height in Text view when saved with tags.
Fixing text tab view.
Updating readability.
Using https for twitter images. Adding a twitter photo sync to fix broken twitter photos. Thanks to @ggrappone for finding this one.
Counting dupe feeds only once in unread counts.
Fixing bookmarklet for NYTimes. Thanks to @rafeco for catching the bug.
Fixing bounce on resize.
disable debug
Mark-read idempotency for social feeds. (#460)
Idempotent mark-as-read DB ops. (#460)
Cleaning up unread counting. (#460)
Fixing height issues with new saved stories sideoptions box.
Limiting new user queue.
Limiting new user queue.
Max overlay fully fade slightly sooner when scrolling down. (#459)
...
Conflicts:
media/css/reader.css
media/js/newsblur/reader/reader.js
media/js/newsblur/views/story_titles_header_view.js
* master: (40 commits)
Version 3.6 of the iOS app.
Fixing tolerance on drag bar.
Fixing switch between story titles on left and on bottom.
Cleaning up after failed backup.
Fixing disappearing righttoolbarmenu icons. Adding preferences for urls to use in-app browser, safari, or chrome.
Fixing transition cancelation on interactive swipe on ipad.
Fixing rotation issues, as well as premature hiding of dashboard on animation on ipad.
Fixing interactive transitions.
Fixing many issues with transitions on the ipad. Still need to fix the interactive transition completion.
Fix#441 - changing text size needs to call evaluateJavascript instead of loadUrl when targeting SDK >= 19
Fixing swipe-back on ipad for transitioning b/w feed list and feed detail.
Fixing paddings on story titles.
Resizing user avatar.
Adding option for side swipe in story detail.
Android v3.0.1.
Fixing cutoff date when retrieving stories.
Mark older/newer stories as read.
Fixing issue with autocomplete.
Fixing infinite loop.
Trying out better autocomplete search with parts.
...
