mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity
5,119 Commits 30 Branches 460 Tags
ee90b7cf9a166bbe2f7c5622e6ec080759e818ab
Commit Graph

179 Commits

Author SHA1 Message Date
Russell Keith-Magee
649463dd34 Fixed #4412 -- Added support for optgroups, both in the model when defining choices, and in the form field and widgets when the optgroups are displayed. Thanks to Matt McClanahan <cardinal@dodds.net>, Tai Lee <real.human@mrmachine.net> and SmileyChris for their contributions at various stages in the life of this ticket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 07:53:02 +00:00
Brian Rosner
a19ed8aea3 Merged the newforms-admin branch into trunk. 
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 23:54:34 +00:00
Malcolm Tredinnick
6d5c868e86 Fixed #7543 -- Typo fix. Thanks, James Turnbull. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-30 06:42:50 +00:00
Adrian Holovaty
82d09948ae Fixed #7482 -- Fixed an awkward wording in docs/model-api.txt. Thanks, cbmeeks <cbmeeks@gmail.com> 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 05:21:29 +00:00
Adrian Holovaty
31ee551057 Various documentation edits 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 03:59:15 +00:00
Luke Plant
9cf3048b08 Fixed #3774 - primary_key=True does not, in fact, imply blank=False 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-20 12:10:13 +00:00
Gary Wilson Jr
f410de010d Refs #7216 -- Corrected typo, removed comma, trimmed trailing whitespace, and fixed reST link in [7678]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-17 15:46:59 +00:00
Russell Keith-Magee
6d242ccc63 Fixed #7216 -- Added a description on how to use named URLs with a permalink. Thanks, masklinn. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-17 13:56:10 +00:00
Adrian Holovaty
3859314d4a Fixed #6944 -- Fixed a small typo in docs/model-api.txt. Thanks, julien 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 04:04:24 +00:00
Luke Plant
23e474510a Reverted mistaken r7545 
r7545 was a mistake due to not accounting for r7078 
Thanks Ramiro Morales for catching this.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-22 19:24:25 +00:00
Luke Plant
5b33adeafc Fixed documentation of 'description' option of Admin.fields to reflect actual behaviour 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-05-22 17:34:02 +00:00
Malcolm Tredinnick
f0bc9426b4 Made a bunch of spelling corrections. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-27 11:55:47 +00:00
Malcolm Tredinnick
9c52d56f6f Merged the queryset-refactor branch into trunk. 
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.

Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-27 02:50:16 +00:00
Malcolm Tredinnick
b3b8422363 Fixed #6445 -- Allow model instances to be used as a default for ForeignKeys 
(via a callable). Also updates the documentation of the "default" attribute to
indicate a callable can be used. Thanks, Philipe Raoult.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-20 06:56:23 +00:00
James Bennett
41d101e9ce Fixed #6541: Corrected documentation of how the admin chooses a default manager. Refs #6538. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 19:55:21 +00:00
Malcolm Tredinnick
af5f07897c Added a "new in development version" marker that I randomly realised I'd forgotten. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-14 00:07:01 +00:00
Adrian Holovaty
b448b678e8 Fixed a typo in docs/model-api.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-13 20:23:06 +00:00
Jacob Kaplan-Moss
00f0519859 Added documentation about the "app.Model" relation syntax introduced by [7185] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-26 21:18:34 +00:00
Malcolm Tredinnick
d9a3c1b9fc Made a bunch of tiny documentation formatting and typo fixes. 
Thanks, quicklizard, adamv, Gary Wilson, superjudge and David Pretty.

Fixed #6554, #6573 ,#6592, #6595, #6608.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-15 11:38:53 +00:00
Adrian Holovaty
e5e75b0c52 Edited various doc changes from [6801] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-04 06:13:56 +00:00
Ian Kelly
bbc3a95557 Fixed #6007: Added DEFAULT_TABLESPACE and DEFAULT_INDEX_TABLESPACE 
options to global_settings.py


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-01 19:23:49 +00:00
Malcolm Tredinnick
e2b03bd0c2 Fixed #5955 -- Made a bunch of ReST fixes. Thanks, SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-29 18:15:38 +00:00
Malcolm Tredinnick
8216abe748 Documentation for creating custom model fields. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-05 13:59:52 +00:00
Malcolm Tredinnick
d1efe9b2f7 Fixed #4944 -- Added a note about Model.save() raising IntegrityError is a 
'unique' constraint is violated. Patch from PhiR.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-20 12:35:10 +00:00
Adrian Holovaty
31a07e8cf9 Fixed errors in docs/model-api.txt changes from [6378] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-20 01:48:47 +00:00
Jacob Kaplan-Moss
980fa8b827 Fixed #231: all fields that should take max_length now do. Thanks, Don Spaulding. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-19 23:33:57 +00:00
Malcolm Tredinnick
e2409750f8 Fixed #3703 -- Added pk property to models. Thanks, Collin Grady and jeromie@gmail.com. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-16 01:57:25 +00:00
Adrian Holovaty
0639474d01 Fixed #5449 -- Noted in docs/model-api.txt that the admin date selection always starts on a Sunday. Thanks, flother 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 18:33:03 +00:00
Adrian Holovaty
9cccf59db5 Fixed #5460 -- unique_together now accepts a single tuple for convenience. Thanks, Deryck Hodge 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 20:36:53 +00:00
Adrian Holovaty
0d52d2b2f9 Fixed #5342 -- Added max_length parameter to EmailField. Thanks, donspaulding and gwilson 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 19:22:43 +00:00
Russell Keith-Magee
bc21612012 Fixed #4544 -- Updated docs for allowed field types in an admin list_filter. Thanks to Matt Croydon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 08:29:51 +00:00
Adrian Holovaty
db6093641c Fixed #5406 -- Fixed spelling error in docs/model-api.txt. Thanks, Andrew Shearer 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-12 13:11:51 +00:00
Gary Wilson Jr
a047f6a8fe Fixed #5346 -- Fixed a couple typos in the model-api docs. Thanks, David Paccoud. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-08 19:30:16 +00:00
Adrian Holovaty
eb2ce98b29 Fixed #5170 -- Made FileField a link in the ImageField section of docs/model-api.txt -- assuming the ReST gods are smiling on me today 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-25 18:48:32 +00:00
Adrian Holovaty
d1bef59905 Fixed #5110 -- Made a small clarification in docs/model-api.txt. Thanks, Jarek Zgoda 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-12 03:01:37 +00:00
Adrian Holovaty
f1edb8c2b3 Fixed #5097 -- Made various updates and corrections to the documentation. Thanks, Nicola Larosa 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-07 02:33:11 +00:00
Adrian Holovaty
d4623df463 Added note to docs/model-api.txt about help_text not being escaped in the admin interface 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-06 05:33:18 +00:00
Gary Wilson Jr
212ee65be7 Fixed #2101 -- Renamed maxlength argument to max_length for oldforms FormFields and db model Fields. This is fully backwards compatible at the moment since the legacy maxlength argument is still supported. Using maxlength will, however, issue a PendingDeprecationWarning when used. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-05 05:14:46 +00:00
Gary Wilson Jr
973f44aa4c Changed some more links to be relative in the documentation. I had a couple unsaved files that didn't get in with [5798]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-05 04:42:26 +00:00
Gary Wilson Jr
b54de86010 Fixed #5078 -- Fixed several broken links to the syndication documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-04 03:19:14 +00:00
Adrian Holovaty
910bbe8f1f Added some additional docs to docs/model-api.txt db_type() section 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-20 21:24:30 +00:00
Adrian Holovaty
ac2b9f2a3f Added a db_type() method to the database Field class. This is a hook for calculating the database column type for a given Field. Also converted all management.py CREATE TABLE statements to use db_type(), which made that code cleaner. The Field.get_internal_type() hook still exists, but we should consider removing it at some point, because db_type() is more general. Also added docs -- the beginnings of docs on how to create custom database Field classes. This is backwards-compatible. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-20 06:28:56 +00:00
Gary Wilson Jr
0be6d32c24 Fixed #4817 -- Removed leading forward slashes from some urlconf examples in the documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-10 02:34:42 +00:00
Malcolm Tredinnick
953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Adrian Holovaty
8cea4c7c5e Fixed some awkward wordings from docs/model-api.txt from [5519] and added 'new in Django development version' notes 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-30 20:58:36 +00:00
Malcolm Tredinnick
ac64e91a0c Merged boulder-oracle-sprint branch (r3965:5512) back into trunk. All 
expected tests pass for all databases.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-23 14:16:00 +00:00
Adrian Holovaty
042d7e44fa Fixed #4637 -- Fixed broken link in docs/model-api.txt. Thanks, john.scott.atlakson@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5505 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-20 19:39:24 +00:00
Adrian Holovaty
7c3fa24fad Fixed #4638 -- Fixed typo in docs/model-api.txt. Thanks, john.scott.atlakson@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-20 19:38:19 +00:00
Malcolm Tredinnick
04f5bd4378 Fixed #4406 -- Documented the maxlength parameter (added in [4295]) for the 
URLField.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-11 11:19:43 +00:00
Jacob Kaplan-Moss
908b72f76d Fixed #3880: added a link to the transaction docs from the model API. Thanks, ken37@tds.net. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-07 18:12:12 +00:00