Commit graph

93 commits

Author SHA1 Message Date
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
537e4ed1c9 Adding user notes. Unverified and needs saved confirmation. 2020-07-15 21:25:00 -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
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
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
d60ec99f3e Removing additional traces of Google Reader. 2020-06-15 17:53:35 -04:00
jmath1
7d95dbb5cf change User.is_authenticated() and User.is_anonymous() to attributes 2020-06-11 15:13:12 -04:00
jmath1
3a88b5210a Add on_delete argument to ForeignKeyField and OneToOneField fields 2020-06-11 05:45:48 -04:00
Samuel Clay
7f38f64447 Removing unused south calls. 2020-06-08 11:07:05 -04:00
Samuel Clay
9ca17dd3b3 Undoing commit that changed story dates. 2019-12-25 15:59:38 -05:00
Samuel Clay
4b5fce6ce7 Showing OPML errors and fixing unicode decode error by sanitizing OPML uploads. 2013-08-07 19:46:47 -07:00
Samuel Clay
859091f4bd Better handling of busted OPML files. 2013-07-05 17:41:20 -07:00
Samuel Clay
63bbfc8f63 Removing Reader import, adding categories. 2013-07-03 22:16:01 -07:00
Samuel Clay
02e17f1dd6 Adding better OAuth test to Google Reader import. 2013-07-01 19:17:10 -07:00
Samuel Clay
144470feb4 Fixing import from reader for anonymous. 2013-05-21 06:27:04 -07:00
Samuel Clay
da2eae976a Fixing OPML exporter on dev. This one's for you @voidfiles. 2013-04-15 09:32:12 -07:00
Samuel Clay
608c5559bb Cutting logs on starred stories to only give aggregate counts. 2013-04-02 16:25:13 -07:00
Samuel Clay
9aafd8eab2 Adding delaying to reader import. Adding reader starred story import. 2013-04-02 15:41:50 -07:00
Samuel Clay
4302f102e8 Fixing broken OPML exporter for broken feeds. 2012-12-10 16:06:28 -08:00
Samuel Clay
8c04e3da1d Adding verbosity to OPML exporter. 2012-12-10 15:58:51 -08:00
Samuel Clay
ef4a1c866e Fixing a bunch of small exceptions. 2012-09-18 13:08:25 -07:00
Samuel Clay
5cf90ea8d0 Adding auto_active flag to reader import, for the iPad. 2012-08-11 13:56:30 -07:00
Samuel Clay
4892e14f29 OAuth -> OAuth 2! For a better feed import experience. 2012-08-10 23:15:16 -07:00
Samuel Clay
2657d714b8 Fixing about 4 bugs that have to do with logging, activating broken premiums, and importing from google reader when the user already has feeds and they aren't being cleared out (broken since friday july 20th, a week ago). Thanks to Luke Dieker for the find. 2012-07-27 12:46:37 -07:00
Samuel Clay
1872b0a091 Adding compacting to user sub folders, to remove dupe subscriptions. 2012-07-20 20:37:35 -07:00
Samuel Clay
351b2763c1 Clearing folders and decoding unicode. 2012-07-20 20:02:37 -07:00
Samuel Clay
d3b58e7cc9 Deferring OPML import if it takes > 20 seconds. Email user when complete. Also, hamburgers. This one's for @torrez. 2012-07-20 19:43:28 -07:00
Samuel Clay
538f08cb46 Hiding uneccessary activites html. Fixing google reader starred stories import. Updating api docs. 2012-07-09 12:41:25 -07:00
Samuel Clay
8907dcb67c Merge branch 'master' into social
* master:
  Fixing OPML import for FastLadder users.
2012-05-14 15:45:29 -07:00
Samuel Clay
05c0d95b81 Fixing OPML import for FastLadder users. 2012-05-14 15:45:25 -07:00
Samuel Clay
dcab6656ae Merge branch 'master' into social
* master:
  Adding tooltip on disabled original page. Thanks to @roycyang for the idea.
  Adding stackexchange to Original blacklist.
2012-05-14 15:27:03 -07:00
Samuel Clay
3b6b503718 Adding stackexchange to Original blacklist. 2012-05-14 15:01:30 -07:00
Samuel Clay
109decc5d0 Merge branch 'master' into social
* master:
  Starred story titles, even if it kills us.
  Chucking ntpd in favor of bluntly recalibrating time on VPSs.
  Adding Robin Good press.
2012-04-23 15:38:54 -07:00
Samuel Clay
668d913013 Starred story titles, even if it kills us. 2012-04-23 15:31:46 -07:00
Samuel Clay
3f0c9b3cfb Calculating stories shared for dashboard statistics graph. 2012-04-12 13:37:19 -07:00
Samuel Clay
b2c9f1310c Merge branch 'master' into social
* master:
  Fixing issue with PuSH hub topic's being too long for the db.
  OPML import: Using custom feed titles if they don't match what's in the feed DB.

Conflicts:
	apps/feed_import/models.py
2012-04-01 20:48:07 -07:00
Samuel Clay
57ebbb0790 OPML import: Using custom feed titles if they don't match what's in the feed DB. 2012-04-01 20:04:03 -07:00
Samuel Clay
a2ee769895 Big cleanup on duplicate feeds with alternative feed links. Also fixing the profile to show followers/followings. 2012-03-12 18:11:13 -07:00
Samuel Clay
41b68b32eb Automatically loading intro or chooser dialog based on progress of new user. 2012-03-12 12:33:54 -07:00
Samuel Clay
2b9ad97b51 Switching a ton of feed and user fetches to simple ID matches. ".user.pk -> .user_id" 2012-01-26 09:32:24 -08:00
Samuel Clay
a47d1211c0 Fixing exception around multiple feeds during Google Reader import process. Also switching rate limit to status code 429. 2011-12-18 11:21:20 -08:00
Samuel Clay
6920b92dd6 Correctly updating feed exceptions by refreshing the feed on page. Also transferring over classifiers and read stories. 2011-11-29 09:43:16 -08:00
Samuel Clay
d2bcce4b6f Better error handling around broken feed pages. 2011-09-04 14:47:47 -07:00
Samuel Clay
96d8283ed0 Updating unit tests, fixing datetime issue in json serialization. 2011-08-31 09:41:34 -07:00
Samuel Clay
2dc97fe594 Fixing issues around broken Google Reader starred stories import. 2011-08-30 09:23:16 -07:00
Samuel Clay
d74065f571 The string feed _id bites again. This time the iphone app. 2011-08-30 08:35:22 -07:00
Samuel Clay
1bdb6abb39 Grabbing 1000 saved stories from Reader. 2011-08-29 22:28:55 -07:00
Samuel Clay
2860359f59 Less aggressive on finding the feed for starred stories. 2011-08-29 21:19:57 -07:00