Commit graph

13872 commits

Author SHA1 Message Date
Samuel Clay
3bb7aa4b42 Adding check for missing user 2021-01-03 13:59:24 -05:00
Samuel Clay
404bfed0f5 Moving anymail down so it uses existing local_settings. 2021-01-03 13:03:40 -05:00
Jonathan Math
68830f00a0 merge master 2021-01-03 12:06:25 -05:00
Jonathan Math
9f4a7481c8 remove python swarm automation script, add WIP swarm automation shell script 2021-01-03 11:27:41 -05:00
Jonathan Math
f0cc45bdd0 fix haproxy Dockerfile 2021-01-03 11:12:14 -05:00
Jonathan Math
cc1896c1aa add haproxy dockerfile and haproxy config for swarm 2021-01-03 11:11:28 -05:00
Jonathan Math
79f249878b remove use of ORIGINAL_PAGE_SERVER 2021-01-03 11:09:25 -05:00
Jonathan Math
878b531927 add monitor route for redis_pubsub 2021-01-03 11:06:20 -05:00
Samuel Clay
bff0c080de Downgrading anymail for django 1.11 2021-01-02 12:21:19 -05:00
Samuel Clay
d2e8d2d02f Switching to anymail 2021-01-02 12:19:25 -05:00
Samuel Clay
b6676b5b0e Merge branch 'sictiru'
* sictiru:
  v10.2.1b1.
  #1392 Collapsing toolbar background
  #1392 Collapsing toolbar. NoActionBar themes
2020-12-21 18:11:25 -05:00
Samuel Clay
dffb1cd2bc v10.2.1b1. 2020-12-21 18:11:20 -05:00
Samuel Clay
d15049e963 Merge branch 'master' into sictiru
* master:
  Binding feeds. Hope this works.
  Adding real-time notification for shared stories. Not doing anything with this on the frontend yet, but the dashboard3 will use it for the global shared stories.
  Android v10.2.0.
  Marking bookmarklet js and css as safe.
  Adding django settings for munin.
  Adding django settings for munin.
  Adding django settings for munin.
  Adding django settings for munin.
  Handling empty feed (specifically for the case of a deleted shared/social feed with a saved search on the deleted feed.
  Clean analytics task name
2020-12-21 16:38:26 -05:00
sictiru
44963672c0 #1392 Collapsing toolbar background 2020-12-19 19:46:20 -08:00
sictiru
14d4e9eba8 #1392 Collapsing toolbar. NoActionBar themes 2020-12-19 16:28:45 -08:00
Samuel Clay
72a76c9ccd Binding feeds. Hope this works. 2020-12-17 18:59:49 -05:00
Samuel Clay
ee7d2cc891 Adding real-time notification for shared stories. Not doing anything with this on the frontend yet, but the dashboard3 will use it for the global shared stories. 2020-12-17 18:52:06 -05:00
Samuel Clay
a6459f11bb Android v10.2.0. 2020-12-15 12:40:27 -05:00
Samuel Clay
ce8db2390a Merge branch 'sictiru'
* sictiru:
  Cleanup immersive mode
  #1253 Re-sync mechanism
2020-12-15 11:47:20 -05:00
Andrei
81dcb76533 Merge branch 'sictiru' of https://github.com/samuelclay/NewsBlur into sictiru 2020-12-15 08:18:25 -08:00
sictiru
19421114a4 Cleanup immersive mode 2020-12-15 08:17:39 -08:00
sictiru
35b718a4d5 #1253 Re-sync mechanism 2020-12-14 18:50:18 -08:00
Samuel Clay
261be66a66 Merge branch 'sictiru'
* sictiru:
  Android v10.1.3.
  Premium subscription currency
  #1204 Show story changes
  #1385 and #1390 In App Browser via Custom Tabs
  #1378 Rearrange and trim main popup menu
  Revert dev version name
  #1381 AndroidX Preference. Nav bar color
  #1381 Action bars and popup menus
  #1381 Material Dark and Black Themes
  #1381 Material Light Theme
  #1381 Support Action Bar and AndroidX Alert Dialog
2020-12-14 17:52:11 -05:00
Samuel Clay
92e892b3ae Android v10.1.3. 2020-12-14 17:52:06 -05:00
Andrei
83878880e7 Merge branch 'sictiru' of https://github.com/samuelclay/NewsBlur into sictiru 2020-12-14 12:14:28 -08:00
sictiru
d5f4fa2e86 Premium subscription currency 2020-12-14 12:13:16 -08:00
sictiru
c7fa94c81b #1204 Show story changes 2020-12-13 17:51:44 -08:00
Samuel Clay
926b6a97b5 Marking bookmarklet js and css as safe. 2020-12-10 14:11:17 -05:00
Samuel Clay
17456e911f Adding django settings for munin. 2020-12-10 12:42:12 -05:00
Samuel Clay
05f3e0ae0d Adding django settings for munin. 2020-12-10 12:40:12 -05:00
Samuel Clay
689cb577b6 Adding django settings for munin. 2020-12-10 12:38:32 -05:00
Samuel Clay
ca6c0b5221 Adding django settings for munin. 2020-12-10 12:35:06 -05:00
Samuel Clay
fbe42ce1ef Handling empty feed (specifically for the case of a deleted shared/social feed with a saved search on the deleted feed. 2020-12-08 18:40:32 -05:00
Samuel Clay
e7fb784d0e Clean analytics task name 2020-12-08 13:47:53 -05:00
Samuel Clay
a8e39cc9cd Merge branch 'master' into sictiru
* master: (179 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 13:08:00 -05:00
Samuel Clay
92d8caf2b4 Merge branch 'django3.1' into docker_django3.1
* django3.1:
  Auto-enabling newsblur3 virtualenv.
  Fixing 2to3 string encoding.
  Rolling back pymongo.
  Upgrading all dependencies. This probably won't work (looking at you timezones).
  Updating feedparser.
  Django 3.1.
2020-12-08 13:06:56 -05:00
Samuel Clay
05756155b1 Merge branch 'django3.0' into docker_django3.0
* django3.0: (184 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 13:04:39 -05:00
Samuel Clay
0a08182293 Auto-enabling newsblur3 virtualenv. 2020-12-08 12:59:46 -05:00
Jonathan Math
5019aad498 fix label names and add volumes 2020-12-08 11:01:41 -05:00
Jonathan Math
278b4b96ac work on the rest of the deployment steps for stack-compose.yml and remove hardcoded user value. Create functionality for machine build failure handling 2020-12-08 11:00:58 -05:00
Samuel Clay
aea4fcbe5b Merge branch 'django3.0' into django3.1
* django3.0: (27 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:10:51 -05:00
Samuel Clay
d0e8e57072 Merge branch 'django2.2' into django3.0
* django2.2: (27 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:10:08 -05:00
Samuel Clay
407da41071 Merge branch 'django2.1' into django2.2
* django2.1: (184 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:09:52 -05:00
Samuel Clay
cc4df03c83 Merge branch 'django2.0' into django2.1
* django2.0: (184 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:09:34 -05:00
Samuel Clay
8371c635f7 Merge branch 'master' into django2.0
* master: (27 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:09:25 -05:00
Jonathan Math
843131e63e use images and remove unnecessary volumes from stack-compose.yml 2020-12-07 21:31:21 -05:00
Jonathan Math
698da6f2f4 make changes to Dockefiles and add new dockerfiles for stack-compose to you since swarm can't build from docker images 2020-12-07 21:08:33 -05:00
Jonathan Math
44f9bec7ee make changes to stack-compose.yml to reduce the need for (unnecessary) volumes in deployment 2020-12-07 21:01:37 -05:00
Jonathan Math
d1d13dd241 add stack-compose.yml file WIP 2020-12-07 20:31:35 -05:00
Samuel Clay
f00784d9dd Removing log override 2020-12-07 17:52:22 -05:00