mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-18 16:49:13 +00:00
Code Issues 32 Releases Wiki Activity
6,978 Commits 29 Branches 451 Tags
Commit Graph

6978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Kaplan-Moss
4f383e2939 Reverted r10709 which I applied to the wrong branch. Sorry for my git-svn fail! 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 11:13:17 +00:00
Jacob Kaplan-Moss
864b78135a Fixed #10188: prevent newlines in HTTP headers. Thanks, bthomas. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 11:10:23 +00:00
Jacob Kaplan-Moss
7935231ef0 [1.0.X] Fixed #8817: get_image_dimensions correctly closes the files it opens, and leaves open the ones it doesn't. Thanks, mitsuhiko. 
While I was at it, I converted the file_storage doctests to unit tests.

Backport of [10707] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 11:02:49 +00:00
Jacob Kaplan-Moss
a109a223b8 [1.0.X] Fixed #10335: handle system locals unknown to Python in timezone name handling. Thanks, mitsuhiko. Backport of [10703] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 09:56:25 +00:00
Gary Wilson Jr
e93b3a7b02 [1.0.X]: Fixed #9610 -- Fixed duplicate uploaded file name mangling when directory contained a dot and file didn't. Based on patches from fadlytabrani and adurdin. 
Backport of r10701 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 05:52:44 +00:00
Gary Wilson Jr
1b9893f991 [1.0.X]: Fixed #9344 -- In the TemporaryFile class used by Windows, proxy to the wrapped file object. Thanks julien and mitsuhiko. 
Backport of r10699 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 04:46:30 +00:00
Jacob Kaplan-Moss
899d484afb [1.0.X] Make sure that all uses of max_length in the test suite use values smaller than 255. If we use max_length > 255 the test suite can't be run on MySQL 4. Backport of [10697] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 18:11:43 +00:00
Marc Fargas
6a080b199c [1.0.X] Updated Spanish translation. 
left one fuzzy string on purpose.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 17:55:54 +00:00
Jacob Kaplan-Moss
09c2559b41 [1.0.X] Fixed #11030: fixed file uploads on non-utf8 filesystem encoding. Thanks, Honza Kral. Backport of [10693] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 17:55:38 +00:00
Marc Fargas
b03e58b936 [1.0.X] Updated Calatan translation. 
Left one fuzzy string on purpose.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 17:55:31 +00:00
Jacob Kaplan-Moss
67f9ad2801 [1.0.X] Fixed #9659: fixed wsgi.file_wrapper in the builtin server. Thanks, mitsuhiko. Backport of [10690] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 15:40:13 +00:00
Jacob Kaplan-Moss
9b724aea20 [1.0.X] Fixed #11026, a small typo in the regroup template tag docstring. Thanks, mitsuhiko. Backport of [10687] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 13:48:35 +00:00
Jacob Kaplan-Moss
643e914d2b [1.0.X] Fixed #8971: correctly reverse urls in admindocs reST roles. Thanks, mitsuhiko. Backport of [10683] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 12:54:33 +00:00
Russell Keith-Magee
fc15d690b1 [1.0.X] Updated svnmerge properties for recent changes 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-05 22:31:15 +00:00
Russell Keith-Magee
6541739765 [1.0.X] Fixed #10275 -- Corrected the edge case of rendering a LogEntry with a contenttype of None. Thanks to Jarek Zgoda for the report, and Peter Bengtsson for the patch 
Merge of r10675 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-05 12:46:50 +00:00
Russell Keith-Magee
c03a0a7837 [1.0.X] Updated svnmerge and svn:ignore properties for recent checkins 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-03 13:50:09 +00:00
Russell Keith-Magee
0e5c80f86c [1.0.X] Fixed #9932 -- Added a validation error when an inline tries to exclude the foreign key that provides the link to the parent model. Thanks to david for the report and patch. 
Merge of r10668 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-03 13:48:27 +00:00
Russell Keith-Magee
f137a7391e [1.0.X] Fixed #9362 -- Prevented inline forms from overwriting the content_type_id attribute on objets being inlined. Thanks to carljm for the report and patch. 
Merge of r10667 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-03 13:47:36 +00:00
Russell Keith-Magee
aefb07d865 [1.0.X] Fixed #8903 -- Corrected rendering of admin inline formsets (tabular and stacked) when the inline model has a custom non-autofield primary key. Thanks to dgouldin for the patch. 
Merge of r10666 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-03 13:46:30 +00:00
Russell Keith-Magee
e7555c09d8 [1.0.X] Updated svnmerge properties for recent changes 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 15:00:01 +00:00
Russell Keith-Magee
6a21ada37e Fixed #9609 -- Modified the clean method of(Null)Boolean field to accept '1' and '0' as valid inputs. Thanks to psagers for the patch. 
This is required to support the use of non-default form widgets such as RadioSelect when the data comes from MySQL, which uses 1/0 to represent booleans.

Merge of r10660 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 14:56:35 +00:00
Russell Keith-Magee
5a089a5b00 [1.0.x] Fixed #10367 -- Corrected an example in the documentation for GenericRelation. Thanks to George Song for the patch. 
Merge of r10659 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 14:55:50 +00:00
Russell Keith-Magee
c5bc893248 [1.0.X] Updated svnmerge properties for recent changes 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 07:46:37 +00:00
Russell Keith-Magee
6e1869c46b [1.0.X] Fixed #9206 -- Clarified documentation of transaction handling in raw SQL, and error recovery for Postgres. Thanks to Richard Davies for the suggestion and draft text. 
Merge of r10655 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 07:44:39 +00:00
Russell Keith-Magee
5f730ded91 [1.0.X] Fixed #10954 -- Corrected error in docs example describing extending the JSON serializer. Thanks to Glenn for the report. 
Merge of r10654 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 07:43:55 +00:00
Russell Keith-Magee
d22290b2ce [1.0.X] Fixed #10349 -- Modified ManyToManyFields to allow initial form values to be callables. Thanks to fas for the report and patch. 
Merge of r10652 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 07:16:30 +00:00
Russell Keith-Magee
3c222b1b8b [1.0.X] Updated svnmerge properties 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-30 15:44:05 +00:00
Russell Keith-Magee
23c12c9c2b [1.0.X] Fixed #10134 -- Added unique_for_[date|day|month|year] validation to ModelForm handling. Thanks to Alex Gaynor for the patch. 
Merge of r10646 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-30 13:49:14 +00:00
Russell Keith-Magee
655b602020 Updated svnmerge properties for recent checkins 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-28 14:33:31 +00:00
Russell Keith-Magee
bf10bded7a [1.0.X] Fixed #10082 -- Modified BaseFormSet so that ordering checks work when the formset is empty. Thanks to Petr Marhoun for the report and test case, and bmathieu for the fix. 
Merge of r10643 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-28 14:22:39 +00:00
Jannis Leidel
e114ffb90a [1.0.X] Updated German translation, thanks zerok and bartTC 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-28 09:44:48 +00:00
Justin Bronn
a7bfcba5db [1.0.X] Fixed #10888 -- May now insert NULL GeometryField values on Oracle. 
Backport of r10631 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-24 20:25:48 +00:00
Jacob Kaplan-Moss
3b3c05df72 [1.0.X] Fixed #10163: add an artificial ordering to querysets used by formsets, thus ensuring that POSTed data "lines up" correctly every time. Thanks to Karen Tracey for pointing in the right direction here. 
This is a backport of [10625] from trunk, in a sense. In 1.1 I added a `QuerySet.ordered` property to deal with the logic of determining whether a queryset has ordering, but we can't add new features on a bugfix branch. So here in 1.0-land, the logic has to live in the formset. This smells, but it's better than having a bug.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-23 14:18:11 +00:00
Jacob Kaplan-Moss
91d063c405 [1.0.X] Fixed a needless list() coercion in in ChangeList. Refs #10163. Backport of [10624] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-23 14:18:02 +00:00
Jacob Kaplan-Moss
2ceee52303 [1.0.X] Fixed the tests from [9438] to work consistantly across databases. In particular, it was failing on newer versions of PostgreSQL after [10586]. Backport of [10626] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-22 22:41:18 +00:00
Karen Tracey
c39b59e1d9 [1.0.X] Blocked r10621 from merge to branch, and updated svnmerge-integrated to reflect all changesets that have been merged. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-22 19:26:00 +00:00
Jacob Kaplan-Moss
421b22e8ee [1.0.X] Fixed #10208: ModelAdmin now respects the exclude and field atributes of custom ModelForms. Thanks, Alex Gaynor. Backport of r10619 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-22 16:14:02 +00:00
Luke Plant
cb92893598 [1.0.X] Fixed #10884 - more lenient regexp for matching forms in CSRF post-processing 
Thanks to Ryszard Szopa for the report and fix

Backport of r10617


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 23:44:28 +00:00
Justin Bronn
725ffa57bb [1.0.X] Fixed #10839 -- GeoQuery now unpickles properly on Oracle. 
Backport of r10615 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 22:40:49 +00:00
Justin Bronn
f110f91a03 [1.0.X] Fixed various Oracle errata and test failures present in this branch (including not going to 11). 
Backport of Oracle-related changes from trunk in r10197.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 21:25:47 +00:00
Justin Bronn
ed5e3c3d2b [1.0.X] Fixed #10791 -- The GeoDjango test runner now respects the --noinput command-line option, thanks to seanl for ticket & patch. 
Backport of r10601 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 20:14:42 +00:00
Karen Tracey
7ff22ef258 [1.0.X] Fixed #9651: fixed save_as with inline forms. Thanks, kmike and Mnewman. 
Backport of r10353 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 18:58:32 +00:00
Karen Tracey
0d17a5c7c6 [1.0.X] Fixed #10693: updated params in the docs. 
r10324 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 18:36:45 +00:00
Karen Tracey
65b64d5a08 [1.0.X] Unblocked r10324 and 10353. These changesets are applicable to the branch as well. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 18:34:27 +00:00
Matt Boersma
9fabfedcbe [1.0.X] Fixed #10716 so Oracle tests run again. Thanks very much, kmtracey. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 18:09:52 +00:00
Karen Tracey
a486c1e9b6 [1.0.X] Added a test from Jamie Gennis to ensure #9848 doesn't reappear. 
The bug itself was fixed at some point in the past months (there have
been a few improvements to update() recently). Fixed #9848. 

(Merge of r10528 from trunk.  Per comment in #9848 the fix was in r9967,
which was backported in r9968, thus it seems right to backport the new
test as well.)


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 17:56:54 +00:00
Karen Tracey
40a7b54a00 [1.0.X] Fixed #10601 -- Fixed edit inline display in admin for right-to-left locales. r10524 from trunk. 
Also updated svnmerge metadata to reflect other changesets that have already been applied to the branch.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 17:48:00 +00:00
Karen Tracey
f873836989 [1.0.X] Blocked a bunch of changesets related to new function from merge to branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 16:41:33 +00:00
Justin Bronn
dd51cf9876 [1.0.X] Fixed #10364 -- Correctly identify test spatial database creation errors to the user. 
Backport of r10603 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-20 00:11:36 +00:00
Malcolm Tredinnick
1c925f65b3 [1.0.X] Fixed #8752 -- Fixed django.contrib.auth tests to be locale-independent. 
Patch from Koen Biermans.

Backport of r10599 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-19 03:44:06 +00:00