1
0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Commit Graph

2873 Commits

Author SHA1 Message Date
Malcolm Tredinnick
43809de79d Fixed #1839, #2415, #2536 -- Fixed a generated name clash that was common in
self-referential and circular relations. A lot of community debugging went into
this fix, so thanks to bmurdock@gmail.com, Marek Kubica, ramiro, Michael
Radziej (the last two giving test cases showing the problem) and James Bennett
(who did the hard work to actually diagnose the true problem and fix it).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-08 03:21:35 +00:00
Malcolm Tredinnick
98b2e0a035 Fixed #3646 -- Corrected documentation for ABSOLUTE_URL_OVERRIDES. Patch from
James Bennett.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-07 12:23:01 +00:00
Malcolm Tredinnick
6af3409d98 Removed rsplit() usage for python2.3 compatibility. Refs #3625.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-07 12:15:40 +00:00
Malcolm Tredinnick
55c70238ed Fixed #3636 -- Updated akaihola's entry in AUTHORS.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-07 12:05:25 +00:00
Malcolm Tredinnick
c836f848c6 Fixed #3647 -- Added small fixes to Spanish translation from Mario Gonzalez.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-06 02:01:48 +00:00
Malcolm Tredinnick
f57bef27e7 Fixed #3655, #3656 -- Updated Swedish (sv) translations. Thanks, mikko@sorl.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-06 01:59:27 +00:00
Malcolm Tredinnick
f309bde7f6 Fixed #3654 -- Fixed test failure from [4665].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-06 01:12:46 +00:00
Adrian Holovaty
aa55e98b87 Fixed #3654 -- Added missing Mass. to us_states.py in localflavor. Thanks, joe4444
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-05 19:55:29 +00:00
Malcolm Tredinnick
d181aa0e94 Fixed typo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-02 08:59:21 +00:00
Malcolm Tredinnick
ac09ff9f96 Fixed #3628 -- Fixed a broken link spotted by Manoj Govindan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-02 08:36:54 +00:00
Malcolm Tredinnick
dd99bc7d02 Fixed #3627 -- Made [4659] compatible with Python 2.3. Thanks, Gary Wilson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-02 05:15:27 +00:00
Russell Keith-Magee
790b585819 Added option to pretty-print dumped fixture output
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-02 02:28:44 +00:00
Jacob Kaplan-Moss
a72f908924 Changed the postgres version getting code to use cursor.fetchone() instead of dictfetchone(); some versions (including mine) of psycopg don't export dictfetch functions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-01 17:54:35 +00:00
Russell Keith-Magee
f2582eb972 Fixes #2333 -- Added test fixtures framework.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-01 13:11:08 +00:00
Malcolm Tredinnick
f54777406d Fixed #3614 -- Updated Finnish (fi) translation. Thanks, karsu.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-01 09:08:24 +00:00
Jacob Kaplan-Moss
4eb7e298b6 Added a tearDown to the tests for #639 so that the "uploaded" image doesn't clog /tmp. Sorry, Joseph!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-01 00:02:04 +00:00
Jacob Kaplan-Moss
77be302469 Reverted [4590] (changes to field label CSS) since it caused more problems than it created. Fixes #3596 and reopens #2205.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 22:22:03 +00:00
Jacob Kaplan-Moss
633f0856d2 Fixed #3610: typo in django-admin.txt. Thanks, Yasushi Masuda.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 22:11:45 +00:00
Jacob Kaplan-Moss
7b0e321c55 Removed a stray colon in authentication.txt.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 22:01:52 +00:00
Adrian Holovaty
a81a6e9abe Added note to docs/db-api.txt about 'depth' being new in Django development version
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 19:42:29 +00:00
Jacob Kaplan-Moss
37c66a0999 Fixed #3602: a few small doc fixes. Thanks, Jeremy Dunck
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 19:28:30 +00:00
Jacob Kaplan-Moss
28ad156f10 Fixed #3488: Added "b" option to date format filter. Thanks, Gary Wilson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 16:18:55 +00:00
Jacob Kaplan-Moss
0e683f6da4 Fixed #1240: added better support for different names for "python" to django_bash_completion. Thanks, paolo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 15:39:53 +00:00
Jacob Kaplan-Moss
4477f50f0b Added a "depth" argument to select_related() to control how many "levels" of relations select_related() is willing to follow (refs #3275).
Also added unit tests for select_related().

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 15:24:05 +00:00
Malcolm Tredinnick
9c67c1dd8d FIxed #1984 -- Updated Italian translation. Thanks Nicola Larosa.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 09:32:44 +00:00
Jacob Kaplan-Moss
6ca7930dd4 Fixed #2779: added a copy() method to MergeDict, along with some new tests for django.utils.datastructures. Thanks, Chris McAvoy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 00:35:50 +00:00
Jacob Kaplan-Moss
19e0bf1d44 Fixed #3465: template variable lookups like {{ foobar.13 }} now (correctly) fail silently on unsubscriptable objects. Thanks, Gary Wilson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 20:25:27 +00:00
Jacob Kaplan-Moss
9c2c03a974 Fixed #3598: Added a note about the precedence of URL matches versus extra kwargs in URL patterns. Thanks, Ubernostrum.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 20:11:26 +00:00
Jacob Kaplan-Moss
b97636944d Fixed #2565: added a note about the laziness of querysets in tutorial 4. Thanks, Ubernostrum.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 04:27:47 +00:00
Jacob Kaplan-Moss
a419079347 Fixed #2264: the docs now mention that delete() cascades. Thanks, Ubernostrum
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 03:48:49 +00:00
Malcolm Tredinnick
6dfd32d4e8 Fixed #3590 -- Updated Spanish translations. Combined work from Marc Fargas,
Mario Gonzales and Jorge Gajon.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 01:25:54 +00:00
Malcolm Tredinnick
b497bba1b5 FIxed #3577 -- Updated Swedish translations. Thanks, Ludvig Ericson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 01:23:53 +00:00
Jacob Kaplan-Moss
ee9deca371 Fixed #3039: corrected example code in authentication.txt. Thanks, Ubernostrum.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 00:16:40 +00:00
Jacob Kaplan-Moss
21860fe23a Removed two vestigal URLconfs that refer to Ellington or to non-existant views.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 00:15:11 +00:00
Jacob Kaplan-Moss
8930f3d027 Fixed #3589: settings templates and default settings now mention psycopg2 instead of psycopg1. Thanks (again), Mark Fargas.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-27 00:02:40 +00:00
Jacob Kaplan-Moss
a8ed2b4d58 Fixed #3325: Added docs/distributions.txt, a guide to packaged versions of Django in Debian/Fedora/etc. Thanks to Marc Fargas and Ubernostrum for the patches.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 23:23:01 +00:00
Jacob Kaplan-Moss
516aa4436c Fixed #2490: Added a polite note to runtests.py about setting DJANGO_SETTINGS_MODULE or --settings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 22:34:56 +00:00
Jacob Kaplan-Moss
b581d73222 Fixed #834: Added documentation of the built-in authentication views. Thanks, Ubernostrum.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 22:19:03 +00:00
Adrian Holovaty
b21fd1e451 Small cleanup of docs/model-api.txt change from [4625]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:52:22 +00:00
Jacob Kaplan-Moss
96604fdf8f Fixed #3455: added documentation of Model.get_FIELD_display(). Thanks, Ubernostrum.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:40:15 +00:00
Jacob Kaplan-Moss
9f1bf4659b Fixed #3364: Updated install.txt to recommend psycopg2. Thanks, Marc Fargas.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:39:09 +00:00
Jacob Kaplan-Moss
3e9c41d03b Fixed #3319: Added docs to django-admin.txt about reset and runfcgi. Thanks, Ubernostrum.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:36:14 +00:00
Adrian Holovaty
7b2c6984cd Improved error e-mail docs in docs/settings.txt from [4619]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:33:04 +00:00
Jacob Kaplan-Moss
36a514f818 Fixed #3279: Added a note about using MySQLdb 1.2.1 or later. Thanks, Marc Fargas.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:25:21 +00:00
Jacob Kaplan-Moss
702273d77b Fixed #3195: added a note in settings.txt about DEBUG and HIDDEN_SETTINGS. Thanks, cmgreen@uab.edu
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:22:21 +00:00
Jacob Kaplan-Moss
e7fb31624a Fixed #3135: added some more explanation about how the various error email settings work together. Thanks, Simon G.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 21:18:31 +00:00
Jacob Kaplan-Moss
b9522d0a52 Fixed #2592: Added a warning to tutorial 1 about not naming your project "site" or "django" or anything else similarly boneheaded.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 20:51:21 +00:00
Jacob Kaplan-Moss
f3cc581f3a Fixed #2828, a TypeError when deleting objects with m2m relations to self. Thanks, Brian Beck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 19:12:31 +00:00
Jacob Kaplan-Moss
cb1ff2af35 Fixed another Python 2.3 bug (this one on django.http.parse_file_upload). I think there's one left.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 18:52:15 +00:00
Jacob Kaplan-Moss
2cd6db682f Fixed a few Python2.3-related bugs in the tests (see #3396). A few more left, though.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-26 18:50:55 +00:00