* master:
Prioritizing autocomplete matches on title before address.
Handling URLs in autocomplete.
Adding new autocomplete. Let's hope this doesn't destroy performance in Redis.
Using new Chrome extension for RSS.
Conflicts:
apps/rss_feeds/views.py
# By Samuel Clay (12) and Lance Johnson (1)
* master:
Updating postgres config, celery queue.
Boosting feed fetching.
Android: show server error message to user when add feed fails. The error message was being sent when non-premium users tried to search for feeds and was causing the App to crash.
Removing unused feed hash index (keeping the unique constraint).
Adding two indexes and killing one unused one from feeds.
Returning index on active subs.
Changing logging on feed queueing.
Turning off autocomplete for the time being.
Removing unused indexes.
Upgrade to postgres 9.2.
Culling some graphs on feed counts.
Cleaning up week old feeds.
Boosting feed fetching way up for the weekend.
* master:
Trying to fix the unread counts ghosting issue by forcing an instant unread count refetch of active/selected feeds. This may work!
Fixing limits.conf to just use integers.
Making it a bit easier to setup a new db.
Updating Android app to v1.1 (revision 31).
* master: (81 commits)
Adding font size choices to web preferences.
Closing #66 with both integration of #68 and using the same fonts. Users can add an optional class if they want these other convenient fonts. Also using a few fonts as backups for non-Mac users.
Fix default theming hook
Add multiple targeted font stacks
Fixing #75: shared stories should use story permalink, not story guid. Doh. Thanks @denubis!
Categorizing preferences. Adding window title count back in.
Adding email lookup to forgot password flow.
Adding email lookup to forgot password flow.
Fixing typo in logging.
Fixing autocomplete behavior on add dialog.
Adding broken search for feeds.
Logging
Switching to guid-based read story counts from range based counts. Let's see what this screws up.
Everybody gets unread count in title.
Backporting collections.Counter to python2.6
Fixing broken reply interaction with links.
Prototype of a dupe checker using real-time update times to figure out which feeds are the same. Last time I walked down this road I got run over.
Adding delete user flow. About time, since I'm sick of doing this myself.
Deractivating premiums.
Adding a lock for the intelligence slider for focus stories. If the user selects focus and there are actually focus stories, lock it for the future when there are no unread focus stories.
...
Conflicts:
fabfile.py
* master: (1171 commits)
Fixing repeating friend finding check in both intro and friends dialog.
Saving references to visible feeds when reading by folder.
Major refactor of ios feed list. No longer relies on fragile locations dictionary.
No more error messages on deploying new celery/gunicorn. Also adding NUMA cancellation support to mongo db server.
Fixing ios classifiers in river view.
Adding beta search (only titles and authors for now) for staff only.
Updating enterprise distribution ipa.
Fixing crash when mis-counting feeds. Correcting height of font popover on iphone. Adding horizontal bounce to story page control.
Doubling resync likelihood.
Clearing out old read stories for 1% of all feed fetches with new stories.
Adding unread cutoff to redis sync.
Syncing redis keys by feed_id for read stories.
Adding a sync all redis for user stories to be run in a migration.
Turning off deletion of old stories until the db can be prepped.
Adding index for read story deletion.
Deleting old stories.
Typo in delete read stories log.
Typo in delete read stories log.
Typo in delete read stories log.
Deleting old user stories again. This time going out to 5 times the unread bounds.
...
Conflicts:
local_settings.py.template
settings.py
