* master:
cleanup and fixing some of my stupid bugs
cleanup and fixing some of my stupid bugs
whoops, that section isn't called in the normal installation process. Reverted.
Fix to make detecting if the install is a dev env work properly
Fixed typo. Also, extracted most of the instances of a specific username out to `env.user`, so you don't need to search&replace to do an install. Lastly, added a separate function to change the shell of the host, so it's easier to disable.
Conflicts:
fabfile.py
# By Samuel Clay (4) and ojiikun (1)
* master:
ES requires valid url.
Overriding haystack elasticsearch url.
Removing Redis autocomplete. Upgrading elasticsearch.
Using haystack and elasticsearch for a third autocomplete feature.
Refactor/fix mark-as-read-while-reading workflow.
# By Piotr Mitros (5) and others
# Via Samuel Clay (2) and Daniel (1)
* master:
Normalizing settings.
Fixed#217. Remove (via Newsblur) when sharing
Documented additional hack to get into the system without Stripe installed
Expanded requirements
Fixed doc. We do require a non-fake migrate as well.
Removed SES dependency for development. Fixed bug where DEVELOPMENT was used before being overridden by local_settings.py.
Added requirements.txt
* 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).
