Samuel Clay cb891e0001 Merge branch 'django1.9' into django1.10 ... * django1.9: (102 commits) Beginning fix of rss_feeds unit tests. Fixing unit test for profile app and signup. Remove highlights count when it reaches zero. Android v10.1b1. Stubbing in profile tests. Adding nginx.local.conf Adding original text and original story to API docs. #1282 Adding feed to root folder #1319 In app and external browser options Adding a smarter wakeup for real-time to handle cases where a laptop is re-opened but real-time is not immediately reestablished. #1348 (scroll indicators theme) #1344 (search loses focus) #1335 Auto theme option for OS level dark mode Fixing signup flow. #1347 Show pager with stories after using the intel trainer and refreshing #1272 Load HTML in comments New icon for Infrequent Site Stories. Allowing selection in private notes. Autoresizing private notes field. For #1035: Adding private notes to saved stories. ...		2020-08-10 17:52:12 -04:00
..
fixtures	Fixing unit test for profile app and signup.	2020-08-04 13:10:51 -04:00
management	Merge branch 'django1.9' into django1.10	2020-06-26 08:45:40 -04:00
migrations	upgrade to django 1.6 and make migrations	2020-06-05 11:00:54 -04:00
__init__.py	Finishing off Google Reader OAuth synchronization. Also renamed opml_import -> feed_import. And fixed the height of small modals.	2010-06-29 20:16:09 -04:00
models.py	Merge branch 'django1.9' into django1.10	2020-08-10 17:52:12 -04:00
tasks.py	Adding user notes. Unverified and needs saved confirmation.	2020-07-15 21:25:00 -04:00
tests.py	Merge branch 'master' into darkmode	2020-06-15 18:28:23 -04:00
urls.py	Fix url patterns usage to use a list of url() calls	2020-06-11 04:34:16 -04:00
views.py	Merge branch 'django1.9' into django1.10	2020-06-26 08:45:40 -04:00