1
0
mirror of https://github.com/django/django.git synced 2025-07-18 16:49:13 +00:00

6951 Commits

Author SHA1 Message Date
Russell Keith-Magee
d78ff63ec6 Updated svnmerge properties for some recent changes
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11 15:13:31 +00:00
Malcolm Tredinnick
13475ed646 [1.0.X] Fixed #10369 -- Fixed auto-escaping inside "tran" and "blocktrans" tags.
Patch from Andrew Badr.

Backport of r10519 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11 12:07:52 +00:00
Malcolm Tredinnick
f943e2e418 [1.0.X] Fixed #10357 -- Fixed the "dbshell" command for Windows users.
Thanks to markshep for the patch.

Backport of r10517 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11 11:50:21 +00:00
Russell Keith-Magee
b6bd5ddc33 [1.0.X] Fixed #10571 -- Ensured that unicode POST data is correctly encoded by the test client. Thanks to Rick Wagner for his help identifying and fixing this problem.
Merge of r10513 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11 09:27:04 +00:00
Malcolm Tredinnick
c2a828c7ca [1.0.X] Fixed #10450 -- Fixed an initialisation problem in the savepoint code.
Patch from Jeremy Dunck.

Backport of r10511 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11 07:52:07 +00:00
Malcolm Tredinnick
b853ed4fe7 [1.0.X] Fixed #10773 -- Small fix to the French translation. Thanks, djoume.
Backport of r10508 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11 06:28:58 +00:00
Jacob Kaplan-Moss
b9c0ec63d3 Updated svnmerge metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 21:45:21 +00:00
Jacob Kaplan-Moss
06f379bd5c [1.0.X] Fixed #10753 -- Fixed regression in dispatcher after [10398]. Thanks for the patch and tests, minmax. Backport of r10497 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 21:40:38 +00:00
Jacob Kaplan-Moss
2ab40287bc [1.0.X] Fixed #9640, #10549: BooleanFields with choices, a default, and null=False now correctly doesn't generate a blank option. Backport of r10500 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 19:57:11 +00:00
Jacob Kaplan-Moss
7a283f790c [1.0.X] Converted model_fields regression tests into unittests. Backport of r10499 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 19:56:56 +00:00
Jacob Kaplan-Moss
1a541eebd3 [1.0.X] Fixed #10038: make BaseModelFormSet.save_existing_objects use Form.has_changed() instead of looking at changed_data directly. Thanks, karihre. Backport of r10495 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 18:45:06 +00:00
Jacob Kaplan-Moss
f3eff22de7 [1.0.X] Fixed a silly typo in my bio. How embarrassing. Backport of r10490 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 17:10:57 +00:00
Jacob Kaplan-Moss
ca5b624b05 [1.0.X] Fixed #10774: accessing form media types in templates (i.e. `{{ form.media.js }}`) now works. Thanks, tarequeh and Alex Gaynor. Backport of r10489 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 17:10:44 +00:00
Jacob Kaplan-Moss
53af452329 [1.0.X] Updated my bio. Backport of r10484 on trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 16:34:49 +00:00
Jacob Kaplan-Moss
a5e0725247 [1.0.X] Fixed #10747: fixed the auth tests to ignore broken user-supplied login/logout templates. Backport of r10482 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 15:53:21 +00:00
Malcolm Tredinnick
fe7250db64 [1.0.X] Fixed #10674 -- Updated Arabic translation from Ossama M. Khayat.
Backport of r10479 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 11:29:56 +00:00
Malcolm Tredinnick
4e588ee93d [1.0.X] Fixed #10652 -- Updated Slovenian translation from Gasper Zejn.
Backport of r10477 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 11:24:55 +00:00
Jarek Zgoda
dccb6e9c9c [1.0.X] Polish translation updated
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 09:53:58 +00:00
Malcolm Tredinnick
3ae27692b2 [1.0.X] Fixed #10593 -- Updated Portugese Brazilian translation.
Thanks, Guilherme Gondim.

Backport of r10473 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 08:50:05 +00:00
Malcolm Tredinnick
4a0e683ef1 [1.0.X] Fixed #10567 -- Slovak translation update from Marian Andre.
Backport of r10471 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 08:42:13 +00:00
Malcolm Tredinnick
167d21e6ab [1.0.X] Fixed #10446 -- Updated Russiann translation. Thanks, dc.
Backport of r10469 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 08:36:56 +00:00
Malcolm Tredinnick
9e22d3ca4a [1.0.X] Fixed #10077 -- Fixed a Chinese translation error. Thanks, wizunion@gmail.com.
Backport of r10466 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 07:35:57 +00:00
Nicola Larosa
2d97ab1131 [1.0.X] Updated Italian translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 06:24:43 +00:00
Malcolm Tredinnick
dd7198701a [1.0.X] Fixed #9315 -- Handle spaces in URL tag arguments.
Thanks Natalia Bidart and Matías Bordese for most of this patch.

Backport of r10462 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 04:49:00 +00:00
Malcolm Tredinnick
6c45765681 [1.0.X] Fixed #8515 -- Fixed validation of Polish REGON numbers.
Patch from Piotr Lewandowski.

Backport of r10460 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 01:13:29 +00:00
Jacob Kaplan-Moss
8c3d593b0f [1.0.X] Fixed #7944: date-based generic views no longer get confused with a numeric month format. Thanks to Justin Lilly and Alex Gaynor. Backport of r10457 and r10458 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-09 15:28:41 +00:00
Jacob Kaplan-Moss
3891c137d4 [1.0.X] Fixed #9341: add another on ManyToManyFields with raw_id_admins now works correctly. Backport of r10452 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-08 19:58:24 +00:00
Jacob Kaplan-Moss
e013c78ef8 [1.0.X] Fixed the test from [10447] to not depend on os.listdir() ordering. I always forget about that one; thanks, buildbot. Backport of r10449 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-08 19:42:01 +00:00
Jacob Kaplan-Moss
136d8b2854 [1.0.X] Fixed #8422: FilePathField now respects required=False. Backport of r10447 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-08 18:55:06 +00:00
Jarek Zgoda
5fc10e9293 [1.0.X] Polish translations updated: new msgids in comments + unification of messages with trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-08 09:02:29 +00:00
Jacob Kaplan-Moss
3cff712c21 Updated svnmerge metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 22:21:10 +00:00
Jacob Kaplan-Moss
4f2259f539 [1.0.X] Added some tests to show that #9672 has been fixed ever since [10215]. Refs #9672. Backport of r10440 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 22:13:30 +00:00
Justin Bronn
806d898bbf [1.0.X] Fixed #10757 -- Fixed improper selection of primary keys across relations when using GeoManager.values. Thanks, David Gouldin for ticket and initial patch.
Backport of r10434 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 21:33:43 +00:00
Jacob Kaplan-Moss
866574a854 [1.0.X] Fixed #9957: feeds now respect time zone information provided by the pub date. Backport of r10435 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 21:21:17 +00:00
Jacob Kaplan-Moss
8c763da4f7 [1.0.X] Fixed #9555: respect the feed_url feed parameter. Thanks, sedden. Backport of r10432 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 20:30:04 +00:00
Jacob Kaplan-Moss
0013403eee [1.0.X] Fixed #10169: don't accidentally try to redirect to "None" after posting a comment. Backport of r10429 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 20:23:54 +00:00
Jacob Kaplan-Moss
1c2ee287c0 [1.0.X] Fixed #10633, #10691: marked strings in the comments app for translation. Thanks, zgoda. Backport of r10427 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 20:23:42 +00:00
Jacob Kaplan-Moss
6951cece53 [1.0.X] Replaced a misplaced import from [10425].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:53:42 +00:00
Jacob Kaplan-Moss
0c85192ebe [1.0.X] Fixed #10585: comment redirects built from the next parameter now work correctly when next already contains a query string. Backport of r10424 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:50:42 +00:00
Jacob Kaplan-Moss
f78c70b3b2 [1.0.X] Fixed #9956: relax the URL pattern for primary keys in the comment redirect so that models with custom PKs aren't cut out of the loop. Backport of r10422 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:41:31 +00:00
Jacob Kaplan-Moss
503b3ca459 [1.0.X] Fixed #9792: corrected invalid HTML in the comment form and comment preview. Backport of r10420 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:35:11 +00:00
Jacob Kaplan-Moss
a340c7f0e2 [1.0.X] Fixed #9268: pass the "next" param through in the comment preview/post view. Also updated the docs to make this a bit clearer. Backport of r10418 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:29:34 +00:00
Jacob Kaplan-Moss
4c7b2b8baf [1.0.X] Updated svnmerge metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:13:15 +00:00
Jacob Kaplan-Moss
ff4609b686 [1.0.X] Fixed #10714 - made mod_wsgi recommendation consistent across deployment documentation, and removed duplicate modwsgi nav link. Backport of r10411 and r10413 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 19:11:20 +00:00
Russell Keith-Magee
3931829c6e [1.0.X] Fixed #10183 -- Corrected the handling of unicode in assertContains and assertNotContains. Thanks to trbs for the patch.
Merge of r10414 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 12:15:25 +00:00
Karen Tracey
bb558539ad [1.0.X] Made a set of small test changes to avoid leaving temp files hanging around after running the test suite. First, fixed a couple of places where temp dirs were (or could be) created without later being deleted. Second, added a missing close() before unlink() since Windows raises an error on an attempt to remove an open file. Finally, in the file_uploads tests, avoided opening-by-name temporary files that we already have a descriptor for. Doing additional opens seems to run afoul of the Windows issue with deleting open files, so it generally works better to just seek back to 0 instead of calling open multiple times.
Backport/merge of r10406.  Also updated svnmerge metadata.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-05 21:45:07 +00:00
Jacob Kaplan-Moss
520c670b9d [1.0.X] Fixed a sloppy test auth test. [10400] revealed that the auth test was relying on the weird difference between calling a management from the shell and from call_command. That this worked in the first case was pretty much an accident. Backport of r10404 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-05 19:01:03 +00:00
Jacob Kaplan-Moss
734a3ac767 [1.0.X] Fixed the test case from [10399] to be more robust against the order in which test cases are executed. Backport of r10402 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-05 17:54:40 +00:00
Jacob Kaplan-Moss
33173e98c1 [1.0.X] Fixed #10080: call_command now takes option defaults into account, sparing individual commands from any difference between call_command and being run from the shell. Thanks, Alex Koshelev. Backport of 10400 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-05 17:28:09 +00:00
Jacob Kaplan-Moss
35c30ee957 Fixed #9989: fixed a subtle edge case where removing signals could break. Thanks, ferringb. Backport of r10398 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-05 17:21:25 +00:00