1
0
mirror of https://github.com/django/django.git synced 2025-10-16 18:29:26 +00:00

9 Commits

Author SHA1 Message Date
Justin Bronn
34560a01da gis: Merged revisions 6672,6686-6688,6690,6693,6707-6708,6726,6730,6753,6755-6762,6764,6776-6777,6779,6782-6919 via svnmerge from trunk; reverted oracle backend base.py due to ikelly's patch in r6905.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-15 01:38:43 +00:00
Justin Bronn
f66821deae gis: Merged revisions 6614-6671 via svnmerge from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14 19:13:37 +00:00
Jeremy Dunck
7d915d5589 gis: Merged revisions 5540-5582 via svnmerge from
http://code.djangoproject.com/svn/django/trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-01 19:40:39 +00:00
Jeremy Dunck
bdcc95e5cc gis: Merged revisions 4786-5490 via svnmerge from
http://code.djangoproject.com/svn/django/trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@5492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-18 16:48:27 +00:00
Jeremy Dunck
fa3ed6e134 gis: Merged revisions 4669-4785 via svnmerge from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@4786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-23 16:35:57 +00:00
Adrian Holovaty
f32318be98 Proofread changes to docs/serialization.txt from [3795]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-25 17:44:07 +00:00
Malcolm Tredinnick
d8b84cac91 Fixed #2515 -- Allow passing of options to JSON serializer. Thanks, nesh.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-22 13:26:07 +00:00
Jacob Kaplan-Moss
c9032ab07f Added a JSON serializer, a few more tests, and a couple more lines of docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-29 16:42:49 +00:00
Jacob Kaplan-Moss
4ea7a11659 Added initial cut at serialization framework, along with some basic tests and a stab at some docs. This is all a bit rough right now, so expect some bumps.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 16:00:37 +00:00