NewsBlur/apps
Samuel Clay c508c58224 Merge branch 'django1.11' into django2.0
* django1.11: (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:53:48 -04:00
..
analyzer Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
api Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
categories Fixing a bunch of feed fetch py3 errors. Fetching now works! 2020-06-30 20:50:30 -04:00
feed_import Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
mobile remove unnecessary import from apps/mobile/views.py 2020-06-17 03:20:13 -04:00
newsletters update all models.py files to python3 and django2.0 2020-06-17 00:17:32 -04:00
notifications Monkey patching get_user to remove the session authentication introduced in 1.7 and made required in 1.10. After a year we can remove this monkey patching as all users would have logged in by now, recycling their session. 2020-07-02 17:50:21 -04:00
oauth Merge branch 'django1.11' into django2.0 2020-06-30 12:34:59 -04:00
profile Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
push Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
reader Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
recommendations Fixing a bunch of feed fetch py3 errors. Fetching now works! 2020-06-30 20:50:30 -04:00
rss_feeds Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
search Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46:40 -04:00
social Merge branch 'django1.11' into django2.0 2020-08-10 17:53:48 -04:00
static Remove use of RequestContext and change render_to_response to render 2020-06-12 01:27:07 -04:00
statistics Fixing a bunch of feed fetch py3 errors. Fetching now works! 2020-06-30 20:50:30 -04:00
__init__.py Initial 2009-06-16 03:08:55 +00:00