Samuel Clay 8ad75f4bf9 Merge branch 'master' into grid ... * master: (42 commits) Switching to new redis sessions db. If text fails to fetch, tapping the text button should not change the text lock. Fixing Feed view space bar scrolling bug where story is collapsed. Adding new space bar behavior to full view as well. Fixing space bar scrolling in list view. Adding 'm' keyboard shortcut to toggle read/unread. Shift+space goes backwards too. Jumping to next story when scrolling using space bar. Handling timeout on original page fetch. Fixing timeout error on PUSH. Also fixing requests error on page importing. Boosting timeout on analtics cleaning. Adding fetch original page to msharedstory. Fixing switching to and from text mode while still in current feed. Now to change river so that it uses text view setting from feed, not folder (unlike web). Cutting unneccessary logging. Adding user agents to logging. Reeder, Fever, Superfeedr, Old Reader, IE11. Adding modern android app user agent in logging. Switching back to original redis server for sessions while the new sessions server gets monitored. Adding redis sessions db. Making text view sticky on ios. Maybe bugs? Upgrading to redis 2.8. ... Conflicts: media/js/newsblur/reader/reader_preferences.js		2015-03-11 19:04:42 -07:00
..
fixtures	Fixing reader tests and fixing broken delete where multiple feeds would be deleted.	2013-11-22 11:07:14 -08:00
migrations	Initial oauth provider commit.	2014-01-15 14:29:35 -08:00
__init__.py	Initial	2009-06-16 03:08:55 +00:00
admin.py	Further Mongo work. Stories are now saved correctly, with tags + authors. Still need to do UserStories.	2010-08-21 20:42:38 -04:00
forms.py	Fixing case insensitivity for logging in with an email address.	2014-09-03 17:12:25 -07:00
http.py	All classifier facets and data is now saved, end to end. Now, to apply facets to incoming stories and assign scores.	2010-01-05 16:07:11 +00:00
managers.py	Fixing shared_date for @secretsquirrel. Was inappropriately being converted to plain text date only for stories the user shared themselves.	2012-08-14 12:28:52 -07:00
models.py	Adding an include_hidden parameter to single feeds and rivers, defaulting to false. Clients that don't use hidden stories but use paging as an indicator will need to account for a hidden_stories_count field, as indicating in the API docs.	2015-01-22 11:38:43 -08:00
tasks.py	Boosting timeout on analtics cleaning.	2015-03-11 11:39:54 -07:00
tests.py	Fixing reader tests and fixing broken delete where multiple feeds would be deleted.	2013-11-22 11:07:14 -08:00
urls.py	Fixing OPML backup email messages and sending timing. Also fixing deleting feeds by folder. Fixing reloading of sites in organizer.	2014-10-14 15:59:46 -07:00
views.py	Merge branch 'master' into grid	2015-03-11 19:04:42 -07:00