mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Code Issues 25 Releases Wiki Activity
19,738 Commits 28 Branches 426 Tags 666 MiB
c820892eed
Commit Graph

50 Commits

Author SHA1 Message Date
Claude Paroz
0a4b04fc23 Used https for most *.python.org links 2014-12-19 18:07:52 +01:00
Claude Paroz
35dac5070b Added a new GeoJSON serialization format for GeoDjango 
Thanks Reinout van Rees for the review.
 2014-11-15 18:07:18 +01:00
Berker Peksag
5c517ec218 Fixed versionchanged indentation in docs/. 2014-11-03 21:40:26 -05:00
Berker Peksag
e55fc60f81 Removed unused import from the JSON serialization example. 
This is a leftover from 5612f54bd5.
 2014-10-21 23:49:40 -04:00
Ola Sitarska
6947885926 Fixed #23283 -- Added default=False to BooleanField's in the docs. 
Thanks Baptiste for the suggestion.
 2014-08-13 18:23:52 -04:00
Tim Graham
51c8045145 Removed versionadded/changed annotations for 1.6. 2014-03-24 11:42:56 -04:00
Lukasz Balcerzak
0242134d32 Fixed #17942 -- Added a JsonResponse class to more easily create JSON encoded responses. 
Thanks leahculver for the suggestion and Erik Romijn,
Simon Charette, and Marc Tamlyn for the reviews.
 2014-02-14 18:25:19 -05:00
Tai Lee
e527c0b6d8 Fixed #13252 -- Added ability to serialize with natural primary keys. 
Added ``--natural-foreign`` and ``--natural-primary`` options and
deprecated the ``--natural`` option to the ``dumpdata`` management
command.

Added ``use_natural_foreign_keys`` and ``use_natural_primary_keys``
arguments and deprecated the ``use_natural_keys`` argument to
``django.core.serializers.Serializer.serialize()``.

Thanks SmileyChris for the suggestion.
 2013-10-11 12:52:57 -04:00
Andrew Godwin
b6a957f0ba Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	docs/ref/django-admin.txt
 2013-08-19 18:30:48 +01:00
Tim Graham
7b69c3e775 Removed versionadded/changed annotations for 1.5 2013-08-19 09:09:41 -04:00
Andrew Godwin
f8297f6323 More migration docs, and conversion of all easy syncdb references 2013-07-25 16:19:36 +01:00
Stefan hr Berder
746d3166d6 small typo, example pk=27 but description pk=24 2013-05-16 15:21:18 +08:00
Juan Catalano
78c842a323 Adapted uses of versionchanged/versionadded to the new form. 
Refs #20104.
 2013-04-20 17:18:35 +02:00
Tim Graham
93cffc3b37 Added missing markup to docs. 2013-03-22 13:50:07 -04:00
Florian Apolloner
4506ae0497 Merge pull request #717 from slurms/ticket_19746 
Fixed #19746 -- Allow deserialization of pk-less data
 2013-02-24 06:31:14 -08:00
Horst Gutmann
5612f54bd5 Added more details about the various serialization formats. 2013-02-24 10:58:03 +01:00
Nick Sandford
278dad5b41 Fixed #19746 -- Allow deserialization of pk-less data 2013-02-12 17:10:42 +08:00
Tim Graham
9b5f64cc6e Fixed #19516 - Fixed remaining broken links. 
Added -n to sphinx builds to catch issues going forward.
 2013-01-02 18:32:57 -05:00
Tim Graham
b3a8c9dab8 Fixed broken links, round 3. refs #19516 2012-12-26 19:07:22 -05:00
Claude Paroz
4e8d9524c6 Fixed #6234 -- Removed obsolete note about json and ensure_ascii 
Thanks aaron at cellmap.ca for the report.
 2012-11-03 23:53:51 +01:00
Preston Holmes
e7723683dc Fixed #9279 -- Added ignorenonexistent option to loaddata 
Thanks to Roman Gladkov for the initial patch and Simon Charette for review.
 2012-09-30 23:40:27 -07:00
Aymeric Augustin
c5ef65bcf3 [py3] Ported django.utils.encoding. 
* Renamed smart_unicode to smart_text (but kept the old name under
  Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
  and smart_bytes under Python 2 (which is backwards compatible).
  Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
  want a str.
 2012-08-07 12:00:22 +02:00
Aymeric Augustin
c28e700c7e Removed references to changes made in 1.2. 
Thanks Florian Apolloner for the patch.
 2012-06-07 15:02:35 +02:00
Claude Paroz
865cd35c9b Made more extensive usage of context managers with open. 2012-05-05 14:06:36 +02:00
Alex Ogier
227cec686e Fixed #18214 -- Clarified the docs about serializable objects. 2012-05-03 08:57:22 +02:00
Aymeric Augustin
cec6bd5a59 Fixed #18023 -- Removed bundled simplejson. 
And started the deprecation path for django.utils.simplejson.

Thanks Alex Ogier, Clueless, and other contributors for their
work on the patch.
 2012-04-29 19:58:00 +02:00
Jannis Leidel
954e3b4ad3 Fixed #13914 -- Added natural keys to User and Group models in auth contrib app. Thanks, jbochi and closedbracket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-04 12:48:01 +00:00
Adrian Holovaty
00227b6529 Edited serialization.txt changes from [17355] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-03 20:16:06 +00:00
Aymeric Augustin
d101ed2cb8 Fixed #16364 -- Clarified why automatically created data shouldn't be saved in fixtures. Thanks Gabriel for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-07 21:52:07 +00:00
Ramiro Morales
576e681302 Fixed #17063 -- Fixed visibility of a few version-dependant notes in our documentation. 
Thanks jifeng.yin AT gmail DOT com for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-30 12:59:59 +00:00
Luke Plant
d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:12:01 +00:00
Jannis Leidel
2eadc418af Fixed doc references to django.db.models.query.QuerySet and converted some tabs that were introduced in r16699 to spaces. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:28:39 +00:00
Alex Gaynor
930371e91b Fixed #15889 -- when trying to access to access a serializer that doesn't exist, raise a new SerializerDoesNotExist exception. Thanks to Mathieu Agopian for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-26 16:49:32 +00:00
Russell Keith-Magee
e299ac0cae Reverting r14994 (at request of SmileyChris) because of some backwards compatibility issues that need to be resolved. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 06:05:40 +00:00
Chris Beaven
b60d5df072 Fixes #13252 -- Use the natural key instead of the primary key when serializing 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 04:40:08 +00:00
Jacob Kaplan-Moss
728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents. 
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 19:27:44 +00:00
Russell Keith-Magee
810ed2b22b Fixed #14118 -- Removed a reference to the "Python" serializer. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-16 06:41:48 +00:00
Russell Keith-Magee
92a15532ba Fixed #13661 -- Corrected example in the serialization docs. Thanks to jabapyth for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 02:44:17 +00:00
Luke Plant
9d0b9ad85e Doc updates missed in [13423] 
Refs #13880



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-05 17:19:52 +00:00
Russell Keith-Magee
5a2324afb2 Fixed #13418 -- Added notes on uniqueness requirements for natural keys. Thanks to hunajakippo for the suggestion, and Ramiro Morales for the draft text. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:24:58 +00:00
Jacob Kaplan-Moss
3d84904794 Fixed #12840: mark natural key serialization in the docs as new in 1.2. Thanks, ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 18:39:42 +00:00
Russell Keith-Magee
ebb8ca1cd7 Corrected an example in the natural key serialization docs. Thanks to Alex Gaynor for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-18 00:32:10 +00:00
Russell Keith-Magee
35cc439228 Fixed #7052 -- Added support for natural keys in serialization. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-14 12:39:20 +00:00
Russell Keith-Magee
e85bc81651 Fixed #10954 -- Corrected error in docs example describing extending the JSON serializer. Thanks to Glenn for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 07:39:45 +00:00
Jacob Kaplan-Moss
c6c25adf6d Fixed a whole bunch of small docs typos, errors, and ommissions. 
Fixes #8358, #8396, #8724, #9043, #9128, #9247, #9267, #9267, #9375, #9409, #9414, #9416, #9446, #9454, #9464, #9503, #9518, #9533, #9657, #9658, #9683, #9733, #9771, #9835, #9836, #9837, #9897, #9906, #9912, #9945, #9986, #9992, #10055, #10084, #10091, #10145, #10245, #10257, #10309, #10358, #10359, #10424, #10426, #10508, #10531, #10551, #10635, #10637, #10656, #10658, #10690, #10699, #19528.

Thanks to all the respective authors of those tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 18:30:54 +00:00
Adrian Holovaty
68d15e94d2 Fixed #10218 -- Reworded serialization.txt sentence to remove awkward quotes. Thanks for bringing this up, thedaniel 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-21 08:40:07 +00:00
Malcolm Tredinnick
a9c2f033cd Upgraded included simplejson to 2.0.7. 
Also changed importing logic to prefer a system-installed version of
simplejson (unless it's an earlier version that does not contian the C
speedups), then the json module from Python 2.6, then the version
shipped with Django.

Fixed #9266.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-06 05:13:02 +00:00
Karen Tracey
2efa5f80d6 Fixed #9374 -- Added missing close paren in serialization doc. Thanks jordy. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-01 20:14:36 +00:00
Jacob Kaplan-Moss
5697f87914 Fixed #8701, a couple of bad links in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 20:23:18 +00:00
Jacob Kaplan-Moss
97cb07c3a1 Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 22:25:40 +00:00