Skip to content

Commit

Permalink
Fixes JSON import bug, bumps version number.
Browse files Browse the repository at this point in the history
  • Loading branch information
skoczen committed Nov 15, 2013
1 parent 06f1fe4 commit 9b2a308
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ Improvements to Local backend by [OnlyInAmerica](https://github.com/OnlyInAmeric
Multiple upload improvements by [truetug](https://github.com/truetug).
Better subclassable backends by [minddust](https://github.com/minddust).
Addition of direct S3 support by [skoczen](https://github.com/skoczen), courtesy of [GreenKahuna](https://www.greenkahuna.com).
JSON import bug fixed by [lazerscience](https://github.com/lazerscience)


This code began as such a trivial layer on top of [valum's uploader](http://valums.com/ajax-upload/), [boto](https://github.com/boto/boto), and [alex's ideas](http://kuhlit.blogspot.com/2011/04/ajax-file-uploads-and-csrf-in-django-13.html) it's silly. However, I didn't find any implementations that *just worked*, so hopefully it's useful to someone else. I also drew from these sources:
Expand Down
5 changes: 4 additions & 1 deletion ajaxuploader/views/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from django.utils import simplejson as json
try:
import json
except ImportError:
from django.utils import simplejson as json
from django.core.serializers.json import DjangoJSONEncoder

from django.http import HttpResponse, HttpResponseBadRequest, Http404, HttpResponseNotAllowed
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
author="Steven Skoczen",
author_email="steven@agoodcloud.com",
url="https://github.com/GoodCloud/django-ajax-uploader",
version="0.3",
version="0.3.1",
packages=find_packages(),
include_package_data=True,
zip_safe=False, # because we're including media that Django needs
Expand Down

0 comments on commit 9b2a308

Please sign in to comment.