1
0
mirror of https://github.com/django/django.git synced 2024-11-18 15:34:16 +00:00
Commit Graph

9898 Commits

Author SHA1 Message Date
Ramiro Morales
dc5f2607de Fixed #15029 -- Moved to database backends the ability to decide if two DATABASES items are different when creating temporary databases for tests.
hG: Enter commit message.  Lines beginning with 'HG:' are removed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 14:02:14 +00:00
Carl Meyer
77030ccc1e Fixed a few test docstrings and removed an unused import in staticfiles.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 20:39:40 +00:00
Jannis Leidel
3bff7ed34c Preserve order of STATICFILES_DIRS locations in FileSystemFinder.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 20:10:29 +00:00
Jannis Leidel
5cd5612808 Fixed #15190 -- Refactored the collectstatic command to improve the symlink mode and generally straighten out its behavior.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 19:19:52 +00:00
Russell Keith-Magee
67a2bb6341 Modified the test case from r15383 to avoid an output inconsistency with KeyError.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 15:13:56 +00:00
Carl Meyer
7aad3d3fa8 Fixed #15094 - Added check for forgetting trailing comma in STATICFILES_DIRS tuple. Also reorganized staticfiles settings-checks for better consistency.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:57:10 +00:00
Russell Keith-Magee
74d485c4ec Fixed #15170 -- Skip the inspectdb test under MySQL/MyISAM, because it can't differentiate a foreign key from an integer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:42:52 +00:00
Carl Meyer
76fb2bb0e2 Fixed some documentation and default-settings.py comments that were misleading about the purpose of STATIC_ROOT, and removed an unused import.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:28:07 +00:00
Russell Keith-Magee
9a82eb6ff1 Fixed #14972 -- Ensure that the HTML email logger always produces useful output, regardless of whether it has been given an exception or a request. Thanks to jamstooks for the report, and bpeschier for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:18:07 +00:00
Carl Meyer
00fda7f45d Fixed #13283 -- Corrected CACHE_MIDDLEWARE_ANONYMOUS_ONLY's bad habit of setting Vary: Cookie on all responses and destroying cache efficiency. Thanks to natrius for the fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 00:20:31 +00:00
Carl Meyer
0bf5fbfa76 Some tweaks to the staticfiles docs to clarify things for new users. Thanks Jannis and brutasse for review and discussion.
* Rearranged 'in a nutshell' usage docs to clarify app-dirs vs STATICFILES_DIRS, initially focus on the simplest path to working local dev, and remove the need for repetitive 'you don't need this in local dev' notes.
* Added docs on using staticfiles serve view for non-staticfiles (e.g. user-uploaded files).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-31 22:06:53 +00:00
Justin Bronn
553adfa6d1 Fixed #13488 -- No longer generate unhandled exceptions that may occur when destructors of global GEOS I/O objects are called on process termination.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-31 20:11:19 +00:00
Carl Meyer
b8a8066ac4 Fixed duplicate-named contrib.sessions tests, and removed unused import (cleanup from doctest conversion).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-31 18:37:28 +00:00
Jannis Leidel
f3a9c719fe Added check to the staticfiles app to make sure the STATIC_ROOT setting isn't accidentally added to the STATICFILES_DIRS setting. Thanks for the suggestion, SmileyChris and harijay.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 23:29:31 +00:00
Jannis Leidel
6361a242af Fixed typo in staticfiles documentation introduced in [15369]. Thanks, harijay.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 23:29:25 +00:00
Jannis Leidel
2d29c11117 Fixed #15196 -- Bumped version up a bit in Sphinx configuration. Thanks, Eric Holscher.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 20:31:39 +00:00
Timo Graham
456534dda9 Fixed #15191 - typo in form validation docs; thanks berto for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 19:09:44 +00:00
Jannis Leidel
9e81e18929 Uses a SortedDict for memoization of staticfiles finder instances to preserve order during tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:36 +00:00
Jannis Leidel
aaa76ca1b3 Fixed #14978 -- Added versionchanged directive to --adminmedia docs clarifying why it's not working with staticfiles (deprecation of AdminMediaHandler).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:30 +00:00
Jannis Leidel
8fe42053bc Reworded parts of the staticfiles documentation after receiving various user feedback. Thanks, all!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:25 +00:00
Russell Keith-Magee
e3d322ede8 Fixed #15177 -- Added note to generic views reference page indicating that the views have been deprecated (mirroring the topic guide). Thanks to rasca for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:33:53 +00:00
Russell Keith-Magee
14c082646d Fixed #15134 -- Removed a duplicate TOC entry for modelforms docs. Thanks to Aryeh Leib Taurog for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:33:27 +00:00
Russell Keith-Magee
4bb1b2304d Fixed #15187 -- Ensure that missing page emails aren't sent when running under debug. Thanks to Dan Carroll for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15363 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:11:45 +00:00
Russell Keith-Magee
56ebab9d85 Fixed #14698 -- Ensure that module_has_sumodule doesn't mistake a cache miss for an existent package. Thanks to Łukasz Rekucki for the report and patch, and to shields for the test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15362 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:10:47 +00:00
Ramiro Morales
4392c8e67e Fixed #15158 -- Fixed error introduced in r15252 in rendering of the template post morten section of the 500 error debug page with loaders other than the file system or application dir loaders. Refs #15122. Thanks gsf for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 15:03:39 +00:00
Justin Bronn
34288ec2f2 Fixed example use of deprecated function in GeoDjango tutorial.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 08:10:20 +00:00
Timo Graham
fe0a15b6c9 Fixed #14993 - Improved docs for ModelAdmin.filter_horizontal adding that it's for ManyToManyFields; thanks jammon for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 02:01:43 +00:00
Jacob Kaplan-Moss
40ea1fb0d7 Another (hopefully the last) trivial commit to test auth.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 22:07:43 +00:00
Graham Dumpleton
b5f0b6f71f Test of commit by non committer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 21:44:45 +00:00
Jacob Kaplan-Moss
cfc40d6d0b A trivial change to test out the new server.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 21:42:11 +00:00
Luke Plant
a0585e99bf Added note to 1.2.5 release notes about ModelAdmin.lookup_allowed change
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 15:47:40 +00:00
Luke Plant
655d5afea9 Fixed #14880 - raw_id_fields in admin does not work when limit_choices_to dictionary has value=False
Thanks to smallming for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 14:08:42 +00:00
Luke Plant
c24bdf044b Fixed #15103 - SuspiciousOperation with limit_choices_to and raw_id_fields
Thanks to natrius for the report.

This patch also fixes some unicode bugs in affected code.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 14:08:25 +00:00
Ramiro Morales
22eaf77f9d Removed leftover empty directory from r15297.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 14:48:37 +00:00
Russell Keith-Magee
9acd00a72e Fixed #15112 -- Ensure that IPv6 addresses are correctly displayed in the admin. Thanks to oxy for the report, and Łukasz Rekucki for the test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 03:15:12 +00:00
Russell Keith-Magee
a5cac772b6 Fixed #13662 -- Added an entry in the README to direct people to the instructions for running the test suite, and cleaned up that section of the docs. Thanks to mir for the report, and to cogat and gg for the draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 03:14:49 +00:00
Russell Keith-Magee
461f01b7a6 Fixed #15061 -- Removed a redundant method implementation in the class-based ModelFormMixin, and did some PEP8 cleanup. Thanks to rasca for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 03:14:20 +00:00
Russell Keith-Magee
1f5309a99e Fixed #15046 -- Added "CHROMEFRAME" as a user agent alias for various MSIE fixes. Thanks to chrj for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 03:13:39 +00:00
Russell Keith-Magee
4a3ea263ef Fixed #14823 -- Corrected bootstrapping problems with register_serializers. Thanks to miker985@uw.edu for the report and draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:29:17 +00:00
Russell Keith-Magee
456b8a9d0c Fixed #14818 -- Added explicit tests for the way that the cycle tag handles escaping. Thanks to steveire.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:28:53 +00:00
Russell Keith-Magee
7012042544 Fixed #15041 -- Added tests for the spaceless tag interacting with escaping. Thanks to steveire.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:28:17 +00:00
Alex Gaynor
7c0e40534b Fixed #15173 -- fixed the tests when run under pypy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 00:00:32 +00:00
Alex Gaynor
7505abf95d Fixed using --pair with python's that aren't the system default, when not in the tests directory, and when using the global DJANGO_SETTINGS_MODULE env var.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 00:00:20 +00:00
Carl Meyer
84291b7b84 Fixed #15161 - Corrected handling of ManyToManyField with through table using to_field on its ForeignKeys. Thanks to adehnert for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 19:10:08 +00:00
Carl Meyer
33c155679c Fixed Python 2.4 incompatibility introduced in r15249.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 18:20:19 +00:00
Ramiro Morales
193f14d862 Fixed #15157 -- Modified evaluation of literals surrounded by _(' and ')' in templates to be evaluated at render time instead of at compile time by using ugettext_lazy. Thanks Jonathan S for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 15:12:18 +00:00
Russell Keith-Magee
69a803a8a6 Made a transaction test optional unless transactions are supported.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 14:49:50 +00:00
Carl Meyer
a9b4f2a400 Tweaked r15303 to avoid O(N) lookup of field name. Thanks to Alex's eagle eyes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 08:39:30 +00:00
Carl Meyer
8151c0431e Copied in-development 1.2.5 release notes to trunk.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 08:10:54 +00:00
Carl Meyer
00e7a571c5 Fixed #6456 - Excised FileField file deletion to avoid data loss. Thanks to durdinator for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 07:46:19 +00:00