Commit graph

543 commits

Author SHA1 Message Date
Samuel Clay
caad01e194 Merge branch 'django1.9' into django1.10
* django1.9: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:38:28 -05:00
Samuel Clay
a09250523b Merge branch 'django1.8' into django1.9
* django1.8: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:38:21 -05:00
Samuel Clay
0981286f56 Merge branch 'django1.7' into django1.8
* django1.7: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:38:13 -05:00
Samuel Clay
7c447c0fbc Merge branch 'django1.6' into django1.7
* django1.6: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:38:01 -05:00
Samuel Clay
d1b5c161b1 Merge branch 'master' into django1.6
* master: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:37:52 -05:00
Samuel Clay
4ee8086bf1 Adding Sample OPML 2020-08-11 11:39:06 -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
ca675b0b5a Fixing unit test for profile app and signup. 2020-08-04 13:10:51 -04:00
Samuel Clay
5dc61fa8c4 Adding nginx.local.conf 2020-07-28 12:06:48 -04:00
Samuel Clay
325a6d26e1 Fixing signup flow. 2020-07-21 17:04:01 -04:00
Samuel Clay
158c02abd4 Merge branch 'django1.9' into django1.10
* django1.9:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:56:15 -04:00
Samuel Clay
4f912a3eb2 Merge branch 'django1.8' into django1.9
* django1.8:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:56:08 -04:00
Samuel Clay
b9bf48fa14 Merge branch 'django1.7' into django1.8
* django1.7:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:56:04 -04:00
Samuel Clay
dae31f712b Merge branch 'django1.6' into django1.7
* django1.6:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:55:58 -04:00
Samuel Clay
313fe0a258 Merge branch 'master' into django1.6
* master:
  Refactoring welcome screen to fix input alignment issue.
  Fixing login rotation.
  Adding cookies to path inspector.
  Upgrading httplib2.
2020-07-07 15:55:49 -04:00
Samuel Clay
154e5b864a Upgrading httplib2. 2020-06-30 17:26:36 -04:00
Samuel Clay
6a893995bd Merge branch 'django1.9' into django1.10
* django1.9:
  Upgrading redis cache.
  Adding cookies to path inspector.
2020-06-26 18:43:00 -04:00
Samuel Clay
8bf623effd Upgrading redis cache. 2020-06-26 18:41:10 -04:00
Samuel Clay
1dbfd87404 Merge branch 'django1.9' into django1.10
* django1.9: (122 commits)
  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.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
  Django 1.9.13.
  De-vendorizing django-paypal, adding to requirements.txt.
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  ...
2020-06-26 08:45:40 -04:00
Samuel Clay
f88d9f7a43 Fixing various django1.9 issues, mainly around templates. 2020-06-25 17:57:35 -04:00
Samuel Clay
62e7c2bb06 Django 1.9.13. 2020-06-24 17:01:56 -04:00
Samuel Clay
12b599fcad Merge branch 'django1.8' into django1.9
* django1.8: (109 commits)
  De-vendorizing django-paypal, adding to requirements.txt.
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  ...
2020-06-24 17:00:44 -04:00
Samuel Clay
cdda78d916 De-vendorizing django-paypal, adding to requirements.txt. 2020-06-24 16:59:43 -04:00
Samuel Clay
540587e01e Merge branch 'django1.7' into django1.8
* django1.7: (108 commits)
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  ...
2020-06-24 16:34:18 -04:00
Samuel Clay
d88dab454a Merge branch 'django1.6' into django1.7
* django1.6: (109 commits)
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  ...
2020-06-24 16:04:10 -04:00
Samuel Clay
2d0c82a7b2 Merge branch 'master' into django1.6
* master: (43 commits)
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  Feed title color
  Tuning feedback colors.
  New blurred logo (for dark mode).
  Half-way fixed homepage. Also adding Auto theme (as default, too), thanks to @dejal's suggestion.
  Adding 10 features to welcome page.
  Removing debugging
  ...
2020-06-24 15:35:07 -04:00
Samuel Clay
745bab15af Older httplib2 doesn't have setuptools legacy issue. 2020-06-23 12:02:19 -04:00
Samuel Clay
891551a592 Upgrading redis session. 2020-06-22 12:25:09 -04:00
Samuel Clay
f056eac6ff Upgrading redis session. 2020-06-22 12:23:40 -04:00
Samuel Clay
c14d6e5bbc Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary? 2020-06-22 11:52:07 -04:00
Samuel Clay
cfd49f2da0 Merge branch 'master' into django1.6
* master: (63 commits)
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  Android v10.0.
  #1161 (android widget) RemoteViews empty state
  Android v10.0b3.
  #1298 (saved searches)
  #1298 (saved searches)
  #1304 (not restoring state)
  #1306 (status bar during fullscreen)
  #1231 (sharing crash)
  #1309 (theme in story detail view)
  Fixed #1314 (persistent "All Done")
  #1306 (status bar during fullscreen)
  #1294 (move to new folder)
  #1293 (invalid permalink)
  #1306 (status bar during fullscreen)
  #1306 (status bar during fullscreen)
  #1294 (move to new folder)
  #1301 (white flash in dark mode)
  ...
2020-06-22 10:49:00 -04:00
Samuel Clay
8c305ad1c8 Adding allowlist (whitelist) for RSS Bridge. 2020-06-22 08:51:02 -04:00
Samuel Clay
0333bd1f99 Updating dependencies 2020-06-15 18:01:18 -04:00
Samuel Clay
d60ec99f3e Removing additional traces of Google Reader. 2020-06-15 17:53:35 -04:00
jmath1
e03dc16af9 change requirements.txt to use django==1.10 2020-06-12 01:27:40 -04:00
jmath1
bf7ebecaea upgrade requirements.txt file 2020-06-11 08:49:06 -04:00
Samuel Clay
cd953e8872 Latest django 1.8 2020-06-08 18:27:24 -04:00
Samuel Clay
38fcbed6fb Cleaning up migrations. 2020-06-08 11:51:26 -04:00
Samuel Clay
ad748549f7 Merge branch 'master' into django1.8
* master:
  https only time
2020-06-08 10:33:14 -04:00
jmath1
c8cbd39c2b Upgrade to django==1.8 2020-06-08 08:11:20 -04:00
jmath1
49ed5dabb4 put psycopg2 back into requirements.txt 2020-06-08 00:04:52 -04:00
Samuel Clay
7e6ac2c98d https only time 2020-06-07 13:36:53 -04:00
jmath1
ede33ad242 change requirements.txt to use django==1.7 2020-06-06 23:12:31 -04:00
Samuel Clay
6490476a31 Merge branch 'master' into django1.6
* master: (34 commits)
  Updating Mercury Parser (in the hopes it fixes #1147, but if not, here's to how do it later).
  Adding twitter lists to feed fetcher.
  20% bounces on newsletters is cause for concern.
  Better text in monitor emails
  Adding newsletter checker and feed fetcher checker for better monitoring.
  Android v10.0b1
  Documenting saved searches in the API. For #1298.
  Relying on fabric instead of nginx to take care of certificate locations.
  Different ssl cert location.
  Adding archive in utils, changing email in disk usage monitor.
  Turning off https-only because the SSL certificate seems to have a broken root.
  Android widget date time format. Exclude hidden stories in widget
  Android widget config list adapter cleanup
  Android widget config nested vs flat list view
  Android widget opens story in All Stories view
  Android widget config feed list updates
  Android widget colors. Widget config empty state. Widget update triggers
  Android widget config feed list filters
  Android widget parse and add new feed fields to db
  Android widget empty view. Tap to config. Default feed set
  ...
2020-06-05 11:03:11 -04:00
jmath1
4e89bcd67a upgrade to django 1.6 and make migrations 2020-06-05 11:00:54 -04:00