Commit graph

88 commits

Author SHA1 Message Date
Samuel Clay
6e07dbaf0f Merge branch 'master' into docker_django3.1
* master: (22 commits)
  Whoops
  Better logging for broken paypal ipns.
  Adding RSS Tracker for Windows to Goodies.
  Refactoring socketio so real-time works around username restrictions.
  Socket.IO v3 on the server too.
  Switching to Socket.IO v3.
  Haproxy splitting for socketio 3
  Socket.io 3
  Handling missing feed.
  Only nb.local.com uses ports for websockets.
  Adding GrazeTEN
  Full node install on setup.
  Updating toprc
  Changing mongodb server.
  Fixing toprc
  Attempting to collect queries for 1% of requests by using DEBUG.
  Fixing mongo install.
  Recalculating premium expiration to take into account forced expirations after gifts.
  Fixing never expire -> 1 year
  Adding 1 year expire to admin.
  ...
2021-01-05 19:12:19 -05:00
Samuel Clay
757b778658 Changing mongodb server. 2021-01-04 13:33:07 -05:00
Samuel Clay
1c62266127 mimetype -> content_type 2020-11-13 11:10:03 -05:00
Samuel Clay
e1fc32fb7d Switching out more request.REQUEST calls. /reader/river_stories needs to handle either GET or POST due to GET url length. 2020-11-12 18:24:38 -05:00
Jonathan Math
5877fd979e missed some mimetype edits in django upgrade 2020-10-24 19:25:26 +07:00
Jonathan Math
991cc3855d bug fixes from missed django/python upgrade 2020-10-12 12:30:40 +07: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
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
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
537e4ed1c9 Adding user notes. Unverified and needs saved confirmation. 2020-07-15 21:25:00 -04:00
Jonathan Math
524045fdf6 add backend argument to login_user functions because there are two backends 2020-07-03 02:20:42 -04:00
Samuel Clay
6f14455115 Proper base64 encode/decode 2020-07-01 16:59:21 -04:00
Jonathan Math
64f0d9a264 2to3 apps/api/ 2020-06-17 00:36:01 -04:00
jmath1
a61e1a7b99 Remove use of RequestContext and change render_to_response to render 2020-06-12 01:27:07 -04:00
jmath1
7d95dbb5cf change User.is_authenticated() and User.is_anonymous() to attributes 2020-06-11 15:13:12 -04:00
jmath1
3f8b0655d4 change mimetype to content_type and stop using request.REQUEST 2020-06-07 08:04:23 -04:00
Samuel Clay
babb51b959 Saving stories from websites. Now just need to go back and finish highlighting to unhighlight and this entire branch can be shipped. 2019-08-27 21:06:59 -07:00
Samuel Clay
b5925d0228 Style adjustments. 2019-08-27 20:28:11 -07:00
Samuel Clay
eecdb186d2 Adding saved story tags to bookmarklet. Just need to hook up the back end. 2019-08-22 22:43:18 -07:00
Samuel Clay
8855fb89c1 Adding authed api url add. 2018-03-19 14:27:30 -07:00
Samuel Clay
8bbd280718 Not showing story diffs in blurblogs. 2016-11-20 19:23:53 -08:00
Samuel Clay
25fbce4477 Adding Content-Security-Policy: connect-src: self to fix sharing on medium. 2016-11-20 19:06:58 -08:00
Samuel Clay
d32b1ed3c2 Adding Content-Security-Policy: self to fix sharing on medium. 2016-11-20 19:05:53 -08:00
Samuel Clay
65888f4270 Handling validation of emails on api. 2016-06-28 16:16:36 -07:00
Samuel Clay
07306152b7 Only search aggressively if authenticated. 2016-02-24 12:14:41 -08:00
Samuel Clay
8c9ac47131 Adding IP logging to feed searching. 2016-02-24 12:11:41 -08:00
Samuel Clay
803e5e970d Adding find_feed logging to diagnose postgres issues. 2016-02-24 12:05:40 -08:00
Samuel Clay
685cd96eee Offering shared story back in api when sharing story. 2015-12-29 20:07:24 -08:00
Samuel Clay
2a73bde306 Fetching title and content from stories shared without content+title. For #755. 2015-12-23 15:24:53 -08:00
Samuel Clay
29405a370c Adding original text fetcher to /api/share-story requests that have no content. 2015-12-23 08:41:35 -08:00
Samuel Clay
d845e151d0 Upgrading api/share_story to newer required_params api. 2015-12-22 19:28:31 -08:00
Samuel Clay
5fd37d2587 For #755: adding authenticated /api/share_story/ endpoint that doens't use profile token. 2015-12-20 22:45:36 -08:00
Samuel Clay
b42d6b9182 Fixing http headers. 2015-07-21 10:38:22 -07:00
Samuel Clay
5e6806e96a Logging emails during signup. 2015-06-27 10:59:06 -07:00
Samuel Clay
bf5d600a71 Marking shared stories as read even if they dont have an associated feed. 2013-07-05 17:25:58 -07:00
Samuel Clay
fd766ad544 Adding ip address to blocked windows devices. 2013-06-21 22:58:53 -07:00
Samuel Clay
943380c118 Removing request info in hopes of speeding up blocking of API requests for bad clients. 2013-06-16 09:26:25 -07:00
Samuel Clay
6cb28f802d Enforcing user agents for windows client apps. 2013-06-15 17:15:15 -07:00
Samuel Clay
2c0309dd2e Showing username on blocked api logins. 2013-06-15 17:13:52 -07:00
Samuel Clay
b18662872a Blocking dumb client apps without user agents. 2013-06-15 09:02:38 -07:00
Samuel Clay
19f144df38 Adding user agent logging for api logins. 2013-06-15 08:59:07 -07:00
Samuel Clay
85120d3f99 Fixing Twitter sharing by upgrading to API v1.1. 2013-06-12 13:52:43 -07:00
Samuel Clay
5259147e8e Merge branch 'muserstory_remove' into circular
* muserstory_remove:
  Switching to faster unread counting for socialsubs and usersubs.
2013-05-14 17:31:13 -07:00
Samuel Clay
9a6e9078c3 Switching to faster unread counting for socialsubs and usersubs. 2013-05-14 17:31:08 -07:00
Samuel Clay
d444161414 Adding iPhone sized interaction cell. Also fixed infernal race condition between loading stories and looking for try feed when animating in feed detail view controller. 2013-02-21 17:57:32 -08:00
Samuel Clay
decd50a610 Making links from bookmarklet shared stories absolute URLs. 2013-02-12 14:11:31 -08:00
Samuel Clay
8d158676b3 Moving statistics tasks. 2012-12-10 13:33:57 -08:00
Samuel Clay
e572b3d53f Moving to better feed finder (in the case of dupe feeds). 2012-10-25 16:14:25 -07:00
Samuel Clay
132ef7db20 Marking shared stories as read. 2012-09-24 13:45:37 -07:00
Samuel Clay
668e78d5d2 Adding two new functions for stories: collect image sizes and grab original article text. Useful for future features. 2012-09-10 17:41:01 -07:00