* 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: (38 commits)
New Play Store image assets.
Fix layout bug on small screens.
Revert "Updating stories which give integrity errors."
Fix laggy updates for saved stories unsave ops.
Ability to unsave stories.
Make height of saved stories row match other folders.
Make rows reliably hilight when tapped. (#282)
Allowing replacement of story dates on integrityerror updated stories.
Swapping errors.
Updating stories which give integrity errors.
Fixing margin on subscribe/follow taskbar button.
Upgrading Android Studio.
Fixing #261. Decoding html entities in story titles (both in the share dialog and in the story detail view).
Flattening gradients on feed and story selection. Adding colored background back in to selected river stories.
Fixing modal resizing. Thanks to @tomtaylor for finding the broken dialog.
Remove unused ABS progress indicator support for reading view.
Implement #426 - preference to show/hide public comments
Pressed state for overlay_done button.
Pressed states for all overlay buttons.
Fit overlays on 360dp screens. Move progress indicator to overlay. Add progress indicator for text mode.
...
# By Samuel Clay (5) and Nicholas Riley (4)
* master:
RC2 for offline iOS.
Re-enabling Google News fetches.
Fixing premium interval in statistics.
Fixing iOS issue on river terminating prematurely.
Clarifying API.
Show Send To in a popover on iPad.
Don't leave popover orphaned when showing original on iPad.
Fix menu popover size on iPad.
Stop menu view controllers from scrolling.
# By ojiikun (6) and Samuel Clay (3)
* master:
Adding ellipses in webkit.
Adding downtime handling to readme.
Putting a max on sporadic checks on broken feeds to 8x normal amount.
Complete styling of overlay buttons.
Placeholder styling of overlay buttons.
Enable/disabe state for overlay buttons.
Make overlay buttons fuctional.
Basic overlay button UI.
Fix crash on marking all stories read (#382)
* master:
Only turn real-time feeds into lazy feeds if there is a track record of push notifications.
Switching Email Story menu item to show email icon.
Turning off redis dupe story id writer.
* master:
Handing out free accounts a little quicker.
Adding count of trimmed stories.
Adding redis backup for new redis stroy server.
Adding Buffer as a share option.
Moving story hash db to its own server (primary).
Adding cost to fabfile's list_do.
Moving node server to db pubsub role.
Moving from specific db hosts to db roles, editable through /etc/hosts.
New ssh keys, syn_cookies setting for redis pubsub server.
Handling socket level errors in socketio/node.
Catching exceptions for node redis.
Catching exceptions for node redis.
Trying to fix issues on node redis connection.
Handling redis connection timeouts in node.
* master:
Adding folder search for admin only. If you're reading this commit message, don't get excited. I probably won't be launching folder search using this method. It'll be a while before I can ship it. But if for some strange reason folder search is much faster than I thought, this has a chance.
Fixing rounded corners on Android. Also fixing a few spacing issues.