* master: (29 commits)
Adding new preference for wrapping story content either at 700px or edge of screen.
Bumping Android to v4.2.1.
Work around API change that throws out hidden stories and vends blank pages. (#664)
Fixing duplicate Pocket share extension message.
Don't cache super-small images.
Don't use cache filenames that are impossible to debug.
Fix image prefetch for protocol-hopping redirects.
Keep action replays around until there is less risk of them being needed.
Overhaul and simplify nextUnread search algo. (#640)
Ensure recounts don't get stuck behind story page requests.
Updating push logging message when skipping.
v4.2.0 of android app.
New maintenance message.
Updating fabfile to handle psycopg2/pgbouncer.
Tweak load throb anim speed for stock devices.
Tweak and comment new story list loading indicator.
Move story list loader to correct position. (#582)
New loading-progress animation for story lists. (#582)
Chopping off milliseconds in push delta.
Chopping off milliseconds in push delta.
...
* master: (41 commits)
Fixing A&L Daily bug where stories all have the same GUID and permalink. Using permalink or timestamp, whichever is unique across the feed.
Bumping Android version.
Only hard-recount unreads if there is a mismatch between remote and local.
Ensure correct ordering of mark-actions and count refreshes.
Better overscroll event filtering.
Document new flag.
Don't check for online status too often.
Quicker transition from offline to online mode.
Offline indicator.
Status messaging for count updates.
Ensure refreshed feed counts show immediately.
Throw out reading actions that will never succeed.
Add story fetch setting to feedback debug.
Add network read profiling.
Complete unread recounting after reading sessions.
Monitoring disk usage should fail on error.
Fixing pythonpath for disk monitor.
Adding disk usage monitor to all database servers.
Deleting unstarred story as part of starred story cleanup.
Logging starred story params.
...
* master:
Adding mark_newer_stories_as_read to socialsubs. Uses story date and not shared date, probably to its detriment.
Adding check to paypal resub ipn.
Fix background colour for blurblog share table in dark theme
* master: (80 commits)
Handling error when user's twitter connection doesn't work.
Handling missing social subs caused by cached subs on android.
Updating elasticsearch to 0.90.13.
Checking premium status on paypal sync.
Bumping Android to 4.1.0b1.
Syncing offline status text with ios.
Buffer more stories while reading.
Fix login crash.
Fix logout crash.
Cap the duty cycle of expensive background services to prevent resource hogging.
Remove status message flicker.
Remove logging.
Ensure stories always load more buffer on start of reading activity. Ensure story load cancels quickly on return to feed list.
Tone down some logging.
Fix crash if user touches reading overlay before cursor is ready.
Fix reading progress indicator if new unreads are found during reading session.
Fix lock crash in legacy DB.
Ensure reading progress meter works on async load.
Discard stale stories if a reading action happens during fetch.
Fix crash.
...
* master:
Adding to regular /reader/feeds (non-flat) as per @manderson23's request. See 23bc4f2.
Adding ratelimit to friends list.
Showing is_staff on mobile devices. Useful for #631.
Logging signals for paypal.
Seeing if signals can be moved around.
Splitting paypal webhook events. Adding payment logging.
Fixing missing paypal IPNs.
Bumping android to v4.0.2.
v4.6.0 enterprise.
Submitting v4.6.0
Fixing ipad rotation page movement. Also correcting story position scrolling.