* master: (65 commits)
Oh my god what a terrible typo. Broke new users.
Adding mark as read button to All Site Stories on web.
Disconnecting facebook when session expires.
Showing facebook posting error.
Change text from mark previous to mark older as read in story context menu (#592)
Fix pager margin drawable for dark theme (#590)
Fixing URL munging when the url includes a non key=value pair in the query string. Ex: https://cns.utoronto.ca/~cks/space/blog/?atom. Thanks to @firesock for finding this.
Adding screenshots for iphone 6 and 6+.
Allowing guids to change if the permalink doesn't.
Don't re-fetch already cached images.
Synchronise DB upgrades with other DB actions. (#591)
Explicity synchro DB writes. (#591)
Cleaner service shutdown. (#591)
Show story list loading indicator only if stories are being fetched, not just if they are queued. (read: don't spin if offline) (#590)
iOS v4.5.0 submitted to the App Store.
Fix loading of stories in focus view.
Disable debug.
Disable debug.
Missed file from new loading indicator in reading frag.
Sync service triggers fewer redraws for loading indicators.
...
* master: (102 commits)
Adding starred_timestap to feed, folder/river, starred, and read feeds. Used for issue #585.
Upgrading all servers to ubuntu 14.10 LTS. Fixing bashocalypse.
Better paypal cancellation and refunds. Now showing paypal errors.
NewsBlur iOS v4.5 beta 3. With iPhone 6/6+ support.
Fixing full bleed images on phone 6 and 6+.
Fixing login view controller for iphone 6. Adding launch images for iphone 6.
Use a shorter localized date format which shouldn't overlap the refresh arrow in most cases.
Adding a missing logo for enterprise deployment.
Trying to fix provisioning issues with the version number.
Handling crash on marking read.
Another provisioning profile attempt.
Yet another provisioning profile for ios 8.
Fixing provisioning profile.
Pushing out ios v4.5.0b1.
Adding locale aware times to pull to refresh menu.
Fixing edge case of feeds still showing after being marked read.
Adding fade feed when read to preferences.
Remove finished TODO.
Don't infinite search for unreads if there are none.
Restore toast for feedback on story-unread from Reading activity.
...
* master: (31 commits)
Fixing login screen for Reeder.
Fixing login screen for Reeder.
Explicit viewport.
Explicit viewport.
Explicit viewport.
Explicit viewport.
Adding viewport to login/signup screen.
Set source_used_id correctly when sharing from a blurblog (#551)
Adding debug option to all text importers.
Adding user_id to every response.
Adding WAI-AREA support for <article> to support LiveJournal.
Fixing last few font size changes for new feed title font styler.
Boosting readability's ability to read Medium posts.
Adding feed font size. Configures both story titles and feed titles. This one's for you @theromit.
Probably not a bug. Probably Adblock.
Adding autosize to share textbox.
Hiding mark as read button when searching.
Fixing images in tutorial.
Removing unnecessary inset box shadow on header elements.
Further correcting OAuth spacing on mobile.
...
* 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: (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.
...
* master: (30 commits)
Fixing search positioning on saved stories.
Fixing positioning of popover options in All Site Stories.
Adding Split tooltip.
Removing extra logging.
Switching feedbar and navbar.
Fixing mark folder as read.
Removing double.
Fixing mark as read on socialsubs.
Adjusting positioning on new feedbar. Also scrolling to selected feed/folder when switch story layouts.
Reloading feed list when adding, moving, and deleting feeds and folders.
Reloading feeds on feed/folder add and feedchooser.
Backend for marking feeds/folders as read at a specific timestamp.
Adding expanded mark read buttons. Needs backend support.
iOS v3. Fixed move site view folder placement as well.
Moving feedbar down to bottom of screen. Prep for new mark read buttons.
Fixing 2 ios crashes: double-tapping instapaper button and a weird keyboard condition.
Fixing activities height for subscriptions on ios. Also turning river back on for third-party clients. That wasn't fair and it's hard to get users to upgrade. I'd rather give users the ability to use the product instead of crippling it, unless there is a proper workflow for upgrading, which only exists on the web today.
Removing last traces of Google Reader from ios app. Also add better final page of ftux. Fixing folder chooser in add dialog on ios.
Fixing colors on share/train buttons when active. Fixing height on profile cells.
Stopping animation of share view/keyboard before orientation has changed.
...
Conflicts:
media/js/newsblur/views/story_titles_header_view.js
