mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-29 12:36:08 +00:00
Code Issues 30 Releases Wiki Activity
11,596 Commits 28 Branches 426 Tags 680 MiB
1c33c0a02a
Commit Graph

11596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jannis Leidel
1c33c0a02a Fixed #17737 -- Stopped the collectstatic management command from copying the wrong file in repeated runs. Thanks, pigletto. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 23:02:38 +00:00
Aymeric Augustin
4557058083 Fixed #17800 -- Prevented Django from starting without a SECRET_KEY, since that opens a variety of security problems. Thanks PaulM for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 21:38:45 +00:00
Carl Meyer
d0f162c73c Corrected contrib.markup filter errors to not use misleading template syntax. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 19:49:19 +00:00
Carl Meyer
b05abd8314 Fixed broken link to python-markdown in contrib.markup docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 19:32:48 +00:00
Carl Meyer
98a1e14e09 Fixed #17730 - Renamed django.utils.htmlparser to django.utils.html_parser to avoid shadowing stdlib HTMLParser in rare case-sensitivity situations. Thanks un33k for the report and gldnspud for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 16:09:01 +00:00
Timo Graham
d2988ce0f4 Fixed #17767 - Added signed cookie session backed to session engine settings docs; thanks Preston Holmes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 01:06:22 +00:00
Luke Plant
3db5b0e485 Fixed #17696 - Queryset prefetch_related() ignores using() 
Thanks to simon29 for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-01 00:57:01 +00:00
Paul McMillan
413e37481d Fixes #17777 and makes tests run again. 
Adds a salted MD5 hasher for backwards compatibility.
Thanks gunnar@g10f.de for the report.

Also fixes a bug preventing the hasher tests from being run during
contrib tests.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-29 20:12:16 +00:00
Ramiro Morales
ae640e5ea0 Fixed #17796 -- Rolled back [17588] because the fix for the original relatively 
corner case (boolean fields under MySQL spatial backend) had a wider scope with
potentially unintended consequences affecting the main MySQL backend and the
required changes wouldn't be appropiate at this point of the 1.4 development
cycle.

Refs #15169.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-29 17:46:23 +00:00
Aymeric Augustin
c471cfd674 Avoided importing _mysql directly. Refs #17755. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-29 08:57:48 +00:00
Aymeric Augustin
97061bdf30 Fixed #17786 (again) -- Ensured destruction of test databases works under Oracle, even with multiple databases, after r17411. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-28 21:23:45 +00:00
Luke Plant
de9942a667 Fixed #17668 - prefetch_related does not work in in_bulk 
Thanks to gurets for the report, and akaariai for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-28 19:34:04 +00:00
Aymeric Augustin
4b641b78fa Fixed #17786 -- Exception when running the tests under Oracle, during the destruction of the test database. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-28 09:50:18 +00:00
Aymeric Augustin
abf2d4295f Fixed #16366 -- Prevented some failures of the django.contrib.auth tests when run within a project. Thanks to everyone who contributed to the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 22:54:35 +00:00
Aymeric Augustin
2ddfcfbec6 Clarified the fact that the signal_changed signal isn't used by Django itself (yet). Refs #17787. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 22:52:07 +00:00
Aymeric Augustin
ce88b57b9a Fixed #17755 -- Ensured datetime objects that bypass the model layer (for instance, in raw SQL queries) are converted to UTC before sending them to the database when time zone support is enabled. Thanks Anssi for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 21:15:25 +00:00
Ramiro Morales
7061da514a Added a diagram of the hierarchy of our TestCase subclasses to the testing docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 19:04:33 +00:00
Luke Plant
0447cc1231 Added versionadded info for ensure_csrf_cookie decorator 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 14:40:36 +00:00
Luke Plant
59b2439e7e Fixed ReST typo in CSRF docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 14:40:27 +00:00
Ramiro Morales
4bbacd2663 Modified tests introduced in r15452 to not run 31 test cases twice. Thanks Julien for discovering this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-27 13:29:56 +00:00
Aymeric Augustin
e0d78f898f Fixed #17715 -- Updated the tutorial for time zone support, plus a few other improvements. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-26 21:17:58 +00:00
Aymeric Augustin
26d12af6fd Fixed #17772 -- typo in the release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-26 20:48:48 +00:00
Ramiro Morales
d96ffa130e Added file missed in r17588. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-26 16:19:40 +00:00
Ramiro Morales
9f6859e1ea Fixed #15169 -- Corrected handling of model boolean fields in MySQL spatial backend. 
Thanks goes to zmsmith and others for reporting the issue and to Justin Bronn for the fix.

Refs #7190, r12578, r12900, #13293, r12939.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-26 14:35:46 +00:00
Timo Graham
5a013cebd9 Fixed #17073 - focused uwsgi docs to Django integration; thanks Preston Holmes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-24 23:24:30 +00:00
Timo Graham
ce4cd788ef Fixed #17757 - Typo in docs/intro/overview.txt; thanks kaushik1618. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-24 22:53:48 +00:00
Timo Graham
e4f468b940 Fixed #17749 - Documented better way of overriding ModelAdmin; thanks chrisdpratt and claudep. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-24 22:50:36 +00:00
Paul McMillan
1525874238 Improved get_random_string(). 
Improved the behavior of get_random_string to re-seed itself each time it is called
if the system does not have a secure random number generator. This will change the
properties of the random string produced, but will be unpredictable to an attacker.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-23 22:51:14 +00:00
Paul McMillan
239e41f7c5 Cleanup to use get_random_string consistently. 
Removes several ad hoc implementations of get_random_string()
and removes an innapropriate use of settings.SECRET_KEY.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-23 21:39:12 +00:00
Julien Phalip
f2de5f4cab Added some Selenium tests for the admin's filter_horizontal and filter_vertical widgets. Ref #13614, #15220. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-23 08:07:07 +00:00
Aymeric Augustin
6daad896fb Reverted r17577 because it's actually possible to use a time zone that isn't the system time zone without pytz, thanks to the TZ environment variable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 21:42:50 +00:00
Aymeric Augustin
8842183448 Noted that TIME_ZONE must be the server time zone when time zone support is enabled and pytz isn't installed. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 21:13:36 +00:00
Aymeric Augustin
8b53616198 Fixed #17728 -- When filtering an annotation, ensured the values used in the filter are properly converted to their database representation. This bug was particularly visible with timezone-aware DateTimeFields. Thanks gg for the report and Carl for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 19:40:27 +00:00
Julien Phalip
c870318996 Stopped hiding the original exception's message when a selenium driver's instantiation fails. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 07:14:20 +00:00
Julien Phalip
a65eed3942 Enabled the admin selenium tests to run on Chrome. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 07:14:10 +00:00
Carl Meyer
354c84d277 Fixed #17678 -- Corrected setup of _meta.proxy_for_model and added _meta.concrete_model. Thanks Anssi Kääriäinen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 05:26:50 +00:00
Chris Beaven
3ac0961e1e Don't let ALLOWED_INCLUDE_ROOTS be accidentally set to a string rather than a tuple. Thanks to Florian Apolloner for pointing this out. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-22 00:42:19 +00:00
Paul McMillan
a3bb4df895 Improved CSRF error message. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-21 23:54:02 +00:00
Aymeric Augustin
5b560ec0c0 Fixed a few typos in the aggregation functions reference. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-21 18:28:35 +00:00
Chris Beaven
0e54c23caf Fixed #17660 -- Standardize extends tag token parsing 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-21 02:59:05 +00:00
Timo Graham
7d7d2d354c Fixed #16758 - Added a warning regarding overriding default settings; thanks cyclops for the suggestion & Aymeric Augustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-20 19:08:22 +00:00
Timo Graham
9e62428c28 Fixed #17390 - Added a note to topics/auth.txt regarding how to decorate class-based generic views; thanks zsiciarz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-20 18:57:51 +00:00
Julien Phalip
e1bbf3b6bc Moved an import statement to handle the case where selenium isn't installed. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 16:53:55 +00:00
Julien Phalip
f0c2228709 Fixed #13068 (again) -- Corrected the admin stacked inline template to allow prepopulated fields to work (Thanks Stanislas Guerra for the report). Also fixed a regression introduced in [16953] where prepopulated fields wouldn't be recognized any more due to the additional "field-" CSS class name prefix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 16:42:12 +00:00
Aymeric Augustin
cfd0cb0064 Fixed #17319 -- Made the example for set_language less error-prone. Thanks Anna Dolma Alonso for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 09:19:38 +00:00
Aymeric Augustin
1d78897c5d Fixed #17166 -- Documented how FIXTURE_DIRS works in the inital data how-to, and edited related bits in the settings reference. 
Performed minor edits for consistency while I was there.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 09:02:52 +00:00
Aymeric Augustin
9d0bf66273 Fixed #17316 -- Mentionned that the MultipleProxyMiddleware provided as an example must run rather early. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 08:09:20 +00:00
Aymeric Augustin
7a7ec73efe Fixed #16452 -- Clarified that the DATE/DATETIME/TIME_INPUT_FORMATS settings have no effect when USE_L10N is True. Thanks Travis Brooks. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 08:00:06 +00:00
Aymeric Augustin
0fe4218427 Fixed #17573 -- Documented MySQL's switch to InnoDB as default storage engine. Thanks Lenz Hirsch for the report and Claude Paroz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-19 07:39:05 +00:00
Timo Graham
03aa030f07 Fixed #17706 - Improved short description example in Tutorial 2; thanks xbito and claudep. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-18 21:50:48 +00:00