Commit graph

13449 commits

Author SHA1 Message Date
Jonathan Math
e063bdc7ea update bootstrap.json to use nb.local.com 2020-10-12 12:31:35 +07:00
Jonathan Math
991cc3855d bug fixes from missed django/python upgrade 2020-10-12 12:30:40 +07:00
Jonathan Math
d370bd5b2e more node modules 2020-10-12 12:28:34 +07:00
Jonathan Math
e27ad0d69a change makefile command name 2020-10-12 12:28:02 +07:00
Jonathan Math
c356782627 add updated node_modules 2020-10-12 12:27:49 +07:00
Jonathan Math
f1f426b9c1 make 2to3 changes for utils files 2020-10-09 12:29:53 +07:00
Jonathan Math
eba100f1eb make 2to3 changes for utils files 2020-10-09 12:29:19 +07:00
Jonathan Math
039c7b20e9 clean up makefile so the default command is 'make start' 2020-10-09 12:28:10 +07:00
Jonathan Math
5b5345d35f add sample opml file to config/fixtures 2020-10-06 22:02:54 +07:00
Jonathan Math
ad0ecdb8cc add migration for timezone change 2020-10-05 16:35:26 +07:00
Jonathan Math
6dbc6dfbe9 add signals.py... not sure why I removed this, but newsblur breaks without this and paypal migrations wont work without it 2020-10-05 16:03:55 +07:00
Jonathan Math
4aea68369a change celery Task import and task initialization as per the new version of celery 2020-10-05 00:45:57 +07:00
Jonathan Math
89e51a2937 change celery Task import and task initialization as per the new version of celery 2020-10-05 00:45:20 +07:00
Jonathan Math
0e4eb419ad upgrade django-timezone-field 2020-10-05 00:42:06 +07:00
Jonathan Math
34184027a6 update makefile commands for django3.0 2020-10-05 00:40:54 +07:00
Jonathan Math
a8bf9c4540 add docker env variable functionality to node files 2020-10-05 00:34:40 +07:00
Jonathan Math
5d82414563 add docker_local_settings and remove unnecessary REDIS settings definition in settings.py because it is already handled in local settings 2020-10-05 00:19:22 +07:00
Jonathan Math
54e31d2597 update celery commands in docker-compose.yml 2020-10-05 00:17:09 +07:00
Jonathan Math
454308f0d2 remove unnecessary dockerfile 2020-10-05 00:16:37 +07:00
Jonathan Math
f8ee044446 add makefile 2020-10-04 17:41:35 +07:00
Jonathan Math
a010dfa866 update docker-compose.yml file to include all services 2020-10-04 17:41:04 +07:00
Jonathan Math
37586bcf6e add dockerfile for haproxy and haproxy.conf 2020-10-04 17:40:37 +07:00
Jonathan Math
bb5028f568 add python3 docker base image 2020-10-04 17:40:13 +07:00
Jonathan Math
19c1319259 add node_base.Dockerfile base image 2020-10-04 17:39:53 +07:00
Jonathan Math
1f5d949cc4 add nginx.local.conf file for docker-compose 2020-10-04 17:39:20 +07:00
Jonathan Math
46ac2cd243 add import for docker_local_settings.py 2020-10-04 17:38:42 +07:00
Jonathan Math
753851f6a8 rename flask to flask_monitor and add import for docker settings 2020-10-04 17:38:02 +07:00
Jonathan Math
4609d04486 add flask to requirements.txt 2020-10-04 17:37:22 +07:00
Samuel Clay
d9615540f3 Merge branch 'django2.2' into django3.0
* django2.2:
  Django 2.2 requires contrib.messages app.
2020-08-10 18:13:12 -04:00
Samuel Clay
d952d79a89 Django 2.2 requires contrib.messages app. 2020-08-10 18:13:02 -04:00
Samuel Clay
c9a7d8713f Merge branch 'django2.2' into django3.0
* django2.2: (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:54:33 -04:00
Samuel Clay
c8f37ba386 Merge branch 'django2.1' into django2.2
* django2.1: (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:54:19 -04:00
Samuel Clay
00de1d80ca Merge branch 'django2.0' into django2.1
* django2.0: (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:54:08 -04:00
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
Samuel Clay
ac1471017d Merge branch 'django1.10' into django1.11
* django1.10: (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:24 -04:00
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
Samuel Clay
4e90e86e04 Merge branch 'django1.8' into django1.9
* django1.8: (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:51:46 -04:00
Samuel Clay
5a3884c3bd Merge branch 'django1.7' into django1.8
* django1.7: (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:51:25 -04:00
Samuel Clay
7ee517444e Merge branch 'django1.6' into django1.7
* django1.6: (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:49:20 -04:00
Samuel Clay
19aa312276 Merge branch 'master' into django1.6
* master:
  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.
  #1282 Adding feed to root folder
  #1319 In app and external browser options
  #1335 Auto theme option for OS level dark mode
  #1347 Show pager with stories after using the intel trainer and refreshing
  #1272 Load HTML in comments
2020-08-10 17:34:43 -04:00
Samuel Clay
acaf222999 Merge branch 'highlights' into django1.6
* highlights: (93 commits)
  Stubbing in profile tests.
  Adding nginx.local.conf
  Adding original text and original story to API docs.
  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)
  Fixing signup flow.
  New icon for Infrequent Site Stories.
  Allowing selection in private notes.
  Autoresizing private notes field.
  For #1035: Adding private notes to saved stories.
  Adding REDIS_SESSIONS to local-settings template.
  Adding user notes. Unverified and needs saved confirmation.
  Fixing typo on highlights check in starred stories.
  Ignoring right-click when highlighting.
  Adding preference to turn off highlighter.
  Trim highlights for consistency and to fix a bug where paragraph ends look different.
  The story margins now allow for highlighting.
  Adding in model for upcoming highlights (so non-highlights branches dont crash on new data
  Renaming highlights to is_highlights for starred story counts.
  ...
2020-08-10 17:34:06 -04:00
Samuel Clay
dec27e7adc Beginning fix of rss_feeds unit tests. 2020-08-04 13:45:16 -04:00
Samuel Clay
ca675b0b5a Fixing unit test for profile app and signup. 2020-08-04 13:10:51 -04:00
Samuel Clay
a29f1235a4 Remove highlights count when it reaches zero. 2020-08-04 08:56:07 -04:00
Samuel Clay
cb6fe9d801 Merge branch 'sictiru'
* sictiru:
  Android v10.1b1.
  #1282 Adding feed to root folder
  #1319 In app and external browser options
  #1335 Auto theme option for OS level dark mode
  #1347 Show pager with stories after using the intel trainer and refreshing
  #1272 Load HTML in comments
2020-08-04 08:50:00 -04:00
Samuel Clay
c591b496e9 Android v10.1b1. 2020-08-04 08:49:10 -04:00
Samuel Clay
6bb652965e Stubbing in profile tests. 2020-07-28 13:01:43 -04:00
Samuel Clay
5dc61fa8c4 Adding nginx.local.conf 2020-07-28 12:06:48 -04:00
Samuel Clay
d1316b1bf3 Adding original text and original story to API docs. 2020-07-28 09:58:52 -04:00
sictiru
4a4161e12b #1282 Adding feed to root folder 2020-07-27 19:04:00 -07:00