Please sign in to comment.
Merge branch 'master' into search
* 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
- Loading branch information...
Oops, something went wrong.