Commit graph

12 commits

Author SHA1 Message Date
Samuel Clay
0d6cb69548 Merge branch 'django1.11' into django2.0
* django1.11: (73 commits)
  Switching to new celery 4 standalone binary.
  Fixing various mongo data calls.
  Upgrading to latest celery 4 (holy moly), which required some big changes to project layout. Still needs supervisor scripts updated.
  Removing unused log on cookies.
  I believe this Context wrapping is still preserved. See this django ticket: https://code.djangoproject.com/ticket/28125. Reverting this fixes the error, so I'm assuming this is that type of render.
  Have to revert 3f122d5e03 because this broke existing sessions (logged me out) because the model has changed and the serialized model stored in redis no longer matches. Whew, this took a while to figure out.
  Upgrading redis cache.
  Adding cookies to path inspector.
  Removing dupe db log.
  Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute."
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
  Fixing CallableBool.
  Missing import
  Fixing runtime errors on django 1.10
  Fixing OAuth connect.
  Fixing various django1.9 issues, mainly around templates.
  BASE_DIR
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  ...
2020-06-30 12:34:59 -04:00
Jonathan Math
af6db197d5 Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46:40 -04:00
Jonathan Math
b3eaa200b9 2to3 apps/feed_import/ 2020-06-17 00:37:13 -04:00
Samuel Clay
4434c8003e Merge branch 'master' into darkmode
* master:
  Adding two dependencies for postlight's mercury parser.
  Updating minimist node dependency.
  Updating dependencies
  Removing additional traces of Google Reader.
  Upgrading to latest node.
  Updating flask requirements.
  Removing Google Analytics. Should've done this 7 years ago.
  Renaming feedfinder and feedfinder2.
2020-06-15 18:28:23 -04:00
Samuel Clay
d60ec99f3e Removing additional traces of Google Reader. 2020-06-15 17:53:35 -04:00
Samuel Clay
953b9712c2 Removing Google Reader traces. 2020-06-10 19:24:02 -04:00
Samuel Clay
bb089f4aeb When adding a feed to a folder, check against the lower case folder name to correct for dupes. 2016-11-14 12:31:41 -08:00
Samuel Clay
5e2020f402 Fixing tests. 2016-04-22 20:48:08 -07:00
Samuel Clay
ad4bc10c92 Updating all unit tests. So far Reader and Feed import pass. Still need to fix RSS feeds. 2011-08-31 18:04:45 -07:00
Samuel Clay
96d8283ed0 Updating unit tests, fixing datetime issue in json serialization. 2011-08-31 09:41:34 -07:00
Samuel Clay
10f58f8608 Renaming json.py to json_functions.py to resolve namespace conflict with anyjson. 2010-10-23 13:06:28 -04:00
Samuel Clay
ce932a95ec 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