* organizer: (136 commits)
Cleaning up sorting on recency. About ready to launch.
Fixing deletion of sites in Organizer, even when switching b/w flat and nested.
Flat hierarchy in organizer means anything that happens to a feed happens to the feed in all of its folders.
Adding in flat/nested hierarchy segmented control in organizer. Need to hook it up to move/delete. Works on sort and selections. Maybe need to preserve or remove selections when switching b/w nested and flat.
Typo.
iOS v4.6.0b3.
Fixing issues with search bar retaining focus b/w view controllers.
Fixing landscape photo size for iphone 4s.
Attempting to fix memory allocation leaks in offline story and image downloaders.
Allowing push urls to not have a User Agent.
Fixing major memory leak when fetching offline images.
Expanding autocomplete menu in ios.
Fixing ios rotation bugs with feed gradient and ipad-narrow sizing.
Fixing rotation page reseting on iOS. Needs a bit of love, but it looks like it works.
Change mark previous/next as read order on Android (#623)
Support search-bypass feed adding for https URLs. (#622)
Add premium status to feedback auto-debug.
Fix crash on db refresh during folder list draw.
Synchro db opening as early as possible.
Synchro legacy DB wrapper.
...
* 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.
...
