Commit graph

35 commits

Author SHA1 Message Date
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
a778e1ba47 fix merge conflicts and pull in changes to fix Django2.0 branch 2020-07-01 00:02:51 -04:00
Samuel Clay
0d6cb69548 Merge branch 'django1.11' into django2.0
* django1.11: (73 commits)
  Switching to new celery 4 standalone binary.
  Fixing various mongo data calls.
  Upgrading to latest celery 4 (holy moly), which required some big changes to project layout. Still needs supervisor scripts updated.
  Removing unused log on cookies.
  I believe this Context wrapping is still preserved. See this django ticket: https://code.djangoproject.com/ticket/28125. Reverting this fixes the error, so I'm assuming this is that type of render.
  Have to revert 3f122d5e03 because this broke existing sessions (logged me out) because the model has changed and the serialized model stored in redis no longer matches. Whew, this took a while to figure out.
  Upgrading redis cache.
  Adding cookies to path inspector.
  Removing dupe db log.
  Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute."
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
  Fixing CallableBool.
  Missing import
  Fixing runtime errors on django 1.10
  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.
  ...
2020-06-30 12:34:59 -04:00
Samuel Clay
11c30d12ce Fixing CallableBool. 2020-06-26 10:15:45 -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
cdda78d916 De-vendorizing django-paypal, adding to requirements.txt. 2020-06-24 16:59:43 -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
Jonathan Math
77b95c0fb3 add __fields__ attribute to ModelForms 2020-06-23 07:21:56 -04:00
Jonathan Math
af6db197d5 Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46: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
Jonathan Math
bd3423fe9c explicitly encode strings before hashing 2020-06-20 00:27:01 -04:00
Jonathan Math
d37f2286b1 fix syntax errors and import issue for compat 2020-06-19 02:35:30 -04:00
Jonathan Math
00b5b162c7 2to3 vendor/paypal/ 2020-06-17 06:02:54 -04:00
Jonathan Math
97d46d0632 2to3 test files 2020-06-17 05:33:59 -04:00
Jonathan Math
e46b2495ce update all models.py files to python3 and django2.0 2020-06-17 00:17:32 -04:00
Jonathan Math
dafb613826 upgrade migrations files to python3 django2.0 2020-06-17 00:11:02 -04:00
jmath1
a760f71fce update the way arguments are used in ReservedValueHiddenInput.build_attrs function in paypal.standard.widgets 2020-06-13 00:24:31 -04:00
jmath1
a61e1a7b99 Remove use of RequestContext and change render_to_response to render 2020-06-12 01:27:07 -04:00
jmath1
0f9d839a49 Fix url patterns usage to use a list of url() calls 2020-06-11 04:34:16 -04:00
jmath1
3a78a6eb3e remove south migrations 2020-06-07 23:59:08 -04:00
jmath1
e9405d4d5b change django.forms.util to django.forms.utils 2020-06-07 01:14:10 -04:00
jmath1
127405e95a add migrations that were autodetected with django1.7 autodetect feature 2020-06-06 23:13:14 -04:00
jmath1
4e89bcd67a upgrade to django 1.6 and make migrations 2020-06-05 11:00:54 -04:00
Samuel Clay
e3c5adb38d Fixing Paypal IPN issues once and for all. 2015-01-15 14:12:21 -08:00
Samuel Clay
4d683a9870 Revert "Upgrading paypal ipn."
This reverts commit 2635ff7136.
2015-01-15 12:40:17 -08:00
Samuel Clay
2635ff7136 Upgrading paypal ipn. 2015-01-15 12:34:29 -08:00
Samuel Clay
512618b3fc Adding logging for paypal ipn. 2015-01-12 19:56:06 -08:00
Samuel Clay
2e429dd293 Adding paypal logging. 2014-12-16 16:19:04 -08:00
Samuel Clay
2c92b40bba Fixing missing paypal IPNs. 2014-12-04 14:59:04 -08:00
Samuel Clay
90f041e50d Updating django-paypal. 2014-11-07 16:22:28 -08:00
Samuel Clay
631ea2de0c Fixing IP address saving after HAProxy originally obscured it. 2013-06-04 12:31:45 -07:00
Samuel Clay
d209b2e905 Adding email for first share to tell users about their blurblog. 2013-04-22 15:24:38 -07:00
Samuel Clay
fa917389a8 Adding Pay by Credit Card as an option to feed chooser dialog. Thus concludes Stripe.js integration. Time to launch! 2012-02-29 12:15:01 -08:00
Samuel Clay
5571fb7202 Vendoring paypal. 2011-10-19 18:14:56 -07:00
Samuel Clay
8e2936fc1b Utils -> vendor 2011-04-11 21:57:45 -04:00