mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 02:26:12 +00:00
Code Issues 25 Releases Wiki Activity
11,637 Commits 28 Branches 426 Tags 666 MiB
a78e61b5e9
Commit Graph

7279 Commits

Author SHA1 Message Date
Jannis Leidel
59a436e963 Fixed #17677 -- Made sure the WizardView doesn't accidentally overwrite the instance or queryset form parameters when they are already set by the get_form_kwargs method. Thanks to goodtune and Stephan Jäkel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-04 16:10:18 +00:00
Julien Phalip
4dca9d166a Added more thorough Selenium tests for the admin horizontal/vertical filter widgets. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-04 01:20:03 +00:00
Jannis Leidel
dd441701ce Fixed #17717 (again) -- Used the new API for concrete models added in r17573. Many thanks to Simon Charette and Anssi Kääriäinen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 21:34:51 +00:00
Aymeric Augustin
7ce1ad7c03 Made django.utils.timezone.localtime a private API -- it's too specific to the template engine. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 19:57:25 +00:00
Jannis Leidel
c988397279 Fixed #10498 -- Fixed using ugettext_lazy values when creating model instances. Thanks to Claude Paroz and Jonas Obrist. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 19:02:49 +00:00
Jannis Leidel
dc49e6143a Fixed #17717 -- Fixed serialization of proxy models. Thanks, Anssi Kääriäinen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 17:50:18 +00:00
Julien Phalip
d636150e53 Fixed #17198 -- Ensured that a deterministic order is used across all database backends for displaying the admin change list's results. Many thanks to Luke Plant for the report and general approach, to everyone involved in the design discussions, and to Carl Meyer for the patch review. Refs #16819. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 02:13:35 +00:00
Jannis Leidel
c76200a0bf Fixed #17819 -- Convinced the NamedUrlWizardView to stop dropping files when stepping through the forms. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-03 01:06:37 +00:00
Jannis Leidel
126d9e1b49 Fixed #17817 -- Modified LocalMiddleware to use full URLs when redirecting to i18n URLs. Thanks to Paul for keeping an eye on the standards. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 22:35:26 +00:00
Carl Meyer
b9bf7cce89 Fixed #15169 -- Added conversion of 0/1 to False/True for MySQL GIS backend. Thanks zmsmith for report, and Ramiro for draft patch and review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 22:32:22 +00:00
Carl Meyer
89b57a7c77 Added missing newline to makemessages output. Thanks Florian Apolloner for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 20:34:46 +00:00
Adrian Holovaty
2ade1e916f Edited stuff from [17543] to [17629] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 17:16:52 +00:00
Jannis Leidel
fcaf8eae14 Fixed #17046 -- Added a check if the username passed to User.objects.create_user is empty or not. Thanks, kwadrat. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 16:56:20 +00:00
Jannis Leidel
4887a8de17 Fixed #16842 -- Modified the RedirectView to correctly handle query strings with percent symbols. Thanks, accuser, jamey@minilop.net and Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 16:55:56 +00:00
Jannis Leidel
e88a65660f Fixed #17806 -- Fixed off-by-n error in the CachedStaticFilesStorage that prevented it from finding files in nested directories. Many thanks to lpetre. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 11:29:14 +00:00
Jannis Leidel
746987f916 Fixed #17734 -- Made sure to only redirect translated URLs if they can actually be resolved to prevent unwanted redirects. Many thanks to Orne Brocaar and Anssi Kääriäinen for input. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 11:07:36 +00:00
Paul McMillan
10e671efaa Modified the error when SECRET_KEY is missing to be a DeprecationWarning. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-02 03:48:26 +00:00
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
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
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
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
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
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
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
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
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
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
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
Jannis Leidel
7dd0ceba2e Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using the request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-18 13:37:30 +00:00
Aymeric Augustin
52b06e29c7 Prevented the generic views from automatically creating a HEAD method when there is no GET. Reverts r16105, refs #17449. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-18 09:50:03 +00:00
Aymeric Augustin
8d221e554c Fixed #17674 -- DECIMAL_SEPARATOR and THOUSAND_SEPARATOR were swapped in the Croatian locale. Thanks deni for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-18 09:36:58 +00:00
Adrian Holovaty
c1bdfd6f6f Changed various non-breaking space characters from [17478] to use the code representation rather than the actual character, which is too hard to overlook because it just looks like a space 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-17 20:23:42 +00:00
Adrian Holovaty
7981efe04f Documentation (and some small source code) edits from [17432] - [17537] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-17 20:04:11 +00:00
Adrian Holovaty
7ecb6813c9 Fixed missing periods in django-admin help for startproject from [17432] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-17 16:51:22 +00:00