* 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.
...
* master: (115 commits)
Fixing ios images. Submitting v3.5.
Fixing mongo btree munin graph.
Adding Swift Reader to Goodies.
Speeding up scrolling on feed list.
Support navigating back to home page from action bar in Preferences
Redrawing intelligence slider on ios.
Normal profile.
V3.0.4 (RC3)
Massively speeding up the viewWillAppear on the feed list.
RC2 (or is it RC3 by now?) of iOS app.
Fixing a crash on mark read.
Fixing broken story page control.
Adding Pinterest.
Tightening up comments line height.
Fixing bug around loading feeds when there's no offline db.
Correctly render DB changes in folder list more quickly.
Fixing empty story hashes.
Cleaning up kill utils.
Fixing hiding and showing of notifier on fetch.
iOS7 app RC2
...
* master:
Adding Pinterest.
Tightening up comments line height.
Correctly render DB changes in folder list more quickly.
Fixing empty story hashes.
Cleaning up kill utils.
Clean up ItemList subclasses.
Clean up ItemsList subclass tagging and lifecycle.
Fix backwards error catch.
Refactor page-crawling in *Reading activities to fix looping. (#387)
* 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
* master: (24 commits)
Skipping google alerts.
Fixing a couple exceptions and turning off google news rss feeds temporarily.
Moving goodies images out of css. New ReadKit image.
Adding permalink blurblog option. Also adding feed title to unmessaged shares.
Moving from X-Real-IP to X-Forwarded-For.
Was using ad hoc and not in house provisioning profile.
Switching provisioning profiles again.
Switching to enterprise provisioning profile.
Fixing provisioning profile.
Putting out v2.4.4 as a RC.
Fixing friend user ids when marking stories as read.
Fixing auto-selection of feeds in feed chooser.
Moving to simpler read story endpoint.
Switching provisioning profiles for the year.
New enterprise build -> 2.4.4. Can be considered an RC1.
New notifier progress bar.
Adding messaging to training while offline in both trainer view controller and story detail view controller.
Users work while offline. Also adding messaging for offline sharing/replying errors.
Fixing mismatch when marking stories as read when offline.
Allowing single subscriber feeds to be seen, as it prevented tryfeeds from working.
...
* master: (26 commits)
Fixing unknown host error on DO servers.
Using All Site Stories instead of Top Level on folder chooser.
Adding new preference for auto-opening a default folder on load.
Unread counter overlay widget for feeds and social feeds.
Fixing memory leak when reloading feeds (after add/remove/move), found entirely through @mihaip's hard work. Thanks!
Disallowing single subscriber feeds to be loaded by non-subscribers.
Fixing #383. Need a way to retrieve starred stories by hash.
Previous story button takes you up, no longer to previous story. Should've done this a while ago.
Adding story intelligence score tip to API.
Adding user_profile to /reader/feeds. Has is_premium field, as well as web preferences.
Switching feed link to point ot the feed's permalink, not a feed filter on the blurblog.
Preventing popular from sharing stories from the same feed id in the same batch.
Upping delay on new user queue.
Fixing jenny holzer quote at end of blurblogs.
Adding better error logging/messaging for marking stories as starred.
Adding better error logging/messaging for marking stories as starred.
Fixing broken icon bug.
Fixing missing user_id in comment's replies and likes.
Posting popular shared stories to twitter.
Boosting shared stories on popular.
...
Conflicts:
apps/reader/views.py
# 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.
