mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 23:44:22 +00:00
Code Issues 24 Releases Wiki Activity
16,299 Commits 28 Branches 423 Tags 639 MiB
10a39debb2
Commit Graph

16299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Graham
722683f508 Fixed #19887 - Noted when callables may be used in ModelAdmin.fields and ModelAdmin.fieldset. 
Thanks Patrick Strasser for the suggestion and Zbigniew Siciarz for the patch.
 2013-02-23 09:45:34 -05:00
Tim Graham
1b7fb29dfb Changed "mysite/mytemplates/" -> "mysite/templates" in tutorial. 
Thanks James Pic.
 2013-02-23 09:19:32 -05:00
Baptiste Mispelon
069280a689 Used token.split_contents() for tokenisation in template tags accepting variables. 
Fixed #6271, #18260.
 2013-02-23 15:15:30 +01:00
Jannis Leidel
6bbf4e57c8 Fixed embarrassing typo in last commit. 2013-02-23 14:59:51 +01:00
Florian Apolloner
67c39a64e0 Merge pull request #759 from erikr/master 
Fix #17751: Added stripping of whitespace for IPAddressField/GenericIPAddressField
 2013-02-23 05:58:48 -08:00
Tim Graham
c89717fabe Fixed #17094 - Typo in class-based views doc. 
Thanks alej0 for the report.
 2013-02-23 08:52:33 -05:00
Jannis Leidel
bb2705d3db Merge pull request #758 from FakoTB/master 
Fixed #19572 - Remove document_root argument from staticfiles views.
 2013-02-23 05:47:20 -08:00
Erik Romijn
21f333bcef Fix #17751: Added stripping of whitespace for IPAddressField/GenericIPAddressField 2013-02-23 14:44:57 +01:00
fako
2db9cbe97c Removes document_root argument from django.contrib.staticfiles.views.serve 
This argument can be removed, because the new way of finding static files doesn't take document_root into account at all.
 2013-02-23 14:38:13 +01:00
Jannis Leidel
c12891e8cd Fixed #19850 -- Use configured staticfiles storage to find the URL of a static file in the admin. 2013-02-23 14:36:51 +01:00
Horst Gutmann
2f4a4703e1 Fixed #19758 -- Avoided leaking email existence through the password reset form. 2013-02-23 14:31:21 +01:00
Aymeric Augustin
7acabbb980 Merge pull request #750 from vanschelven/master 
Fixed #17663 -- Marked BaseModelFormSet.save as alters_data.
 2013-02-23 04:12:11 -08:00
Klaas van Schelven
91c9470664 Method "save" in BaseModelFormSet is marked as alters_data 
Fixes #17663
 2013-02-23 13:01:28 +01:00
Honza Král
6000600cc5 Merge pull request #749 from ecabuk/master 
Fixed #19752 -- Remove the exact Postgresql version from gis doc
 2013-02-23 02:35:32 -08:00
Evrim Çabuk
48a9194755 Remove the exact Postgresql version number from gis install documentation 
ref #19752
 2013-02-23 11:53:10 +02:00
Claude Paroz
7ec2a21be1 Fixed #19686 -- Added HTML5 number input type 
Thanks Simon Charette for his help on the patch. Refs #16630.
 2013-02-23 10:18:08 +01:00
Anssi Kääriäinen
dcf651c27e Fixed Oracle specific failures in commands_sql tests 2013-02-23 01:08:48 +02:00
Claude Paroz
e5a8df06be Fixed #19846 -- Optimized a dict of lists in BlockContext class 
Thanks Curtis Maloney for the report and the patch.
 2013-02-22 23:55:11 +01:00
Anssi Kääriäinen
f565c6f999 Marked a test as expected failure. Refs #19884 2013-02-23 00:33:02 +02:00
Anssi Kääriäinen
88c726bea0 Skipped a test on Oracle 2013-02-23 00:33:02 +02:00
Anssi Kääriäinen
ce094e570e Fixed Oracle regression in last_executed_query() with unicode strings 
The regression was likely caused by the fix in #19606 which adjusted
Oracle's unicode detection, though it seems this would have been an
issue in some configurations even before.
 2013-02-23 00:27:39 +02:00
Anssi Kääriäinen
09fcb70c80 Fixed empty strings + to_field regression on Oracle 
Querying the reverse side of nullable to_field relation, where both
sides can contain null values resulted in incorrect results. The reason
was not detecting '' as NULL.

Refs #17541
 2013-02-23 00:05:31 +02:00
Claude Paroz
60fff6fc94 Documented jQuery upgrade 
Refs #14571.
 2013-02-22 22:02:53 +01:00
Baptiste Mispelon
f13bfbec70 Fixed #19882 -- Smarter tokenizing of {% for %} tag arguments. 2013-02-22 19:19:33 +01:00
Aymeric Augustin
5488437ab6 Factored code and added a missing docstring. 2013-02-21 21:26:40 +01:00
Anssi Kääriäinen
3c6318e831 Fixed #19870 -- Regression in select_related in inheritance cases 
There was a regression in case two models inherited the same parent,
and one contained a foreign key to other. When select_related travelled
the foreign key the other model reused the parent join made by the
first model. This was likely caused by Query.join_parent_model()
addition in commit 68985db482.

Thanks to Trac alias loic84 for report & tests.
 2013-02-21 12:01:23 +02:00
Preston Holmes
649118961c Fixed #19868 -- Clarified purpose of custom user example 2013-02-20 15:32:35 -08:00
Anssi Kääriäinen
50677b29af Made a couple of selenium tests wait for page loaded 
The admin_widgets tests were issuing click() to the browser but
didn't wait for the effects of those clicks. This caused the resulting
request to be processed concurrently with the test case. When using
in-memory SQLite this caused weird failures.

Also added wait_page_loaded() to admin selenium tests for code
reuse.

Fixed #19856
 2013-02-20 23:56:57 +02:00
Alex Gaynor
4e36e0a8b3 Clarified the language used in the documentation. Thanks to Mike Smith for the report. 2013-02-20 13:09:40 -08:00
Anssi Kääriäinen
e8fc3f3783 Added a test for negated Q object querying 
The added test is from the patch in ticket #19672 (written by Ian
Kelly). Fixed #19672, refs #19849.
 2013-02-20 21:45:36 +02:00
Anssi Kääriäinen
10f9ba046f Cleaned up join promotion in query.combine() with OR 
Refs #19849
 2013-02-20 21:45:36 +02:00
Anssi Kääriäinen
edf93127bf Removed join() promote kwarg 
The join promote=True was over-aggressive in select_related handling.
After that was removed, the only other user was query.combine(). That
use case is very easy to handle locally, so there is no more need for
the join(promote=True) flag.

Refs #19849.
 2013-02-20 21:43:44 +02:00
Anssi Kääriäinen
3fef304ff2 Refactored negated IS NULL handling 
This one cleaned up add_filter() negated filter generation. As a side
effect split_exclude() was cleaned up, too.

Refs #19849
 2013-02-20 21:34:01 +02:00
Alex Gaynor
b55cde054e Added a db_constraint option to ForeignKeys. 
This controls whether or not a database level cosntraint is created. This is useful in a few specialized circumstances, but in general should not be used!
 2013-02-20 11:27:32 -08:00
Claude Paroz
cb5545ea2d Fixed #19598 -- Fixed jQuery tagName retrieving 
Thanks rj at rudiculous.net for the report.
 2013-02-20 14:16:00 +01:00
Claude Paroz
4246fe6006 Replaced the obsolete toggle event handling JS function 
The toggle(func1, func2) event handling function has been removed
in jQuery 1.9.
 2013-02-20 13:54:59 +01:00
Claude Paroz
8bbca211b6 Fixed #14571 -- Updated embedded jQuery from 1.4.2 to 1.9.1 
Thanks dArignac for the initial patch.
 2013-02-20 13:52:15 +01:00
Claude Paroz
ae2d04f726 Add test for collapsible fieldset functionality in admin 2013-02-20 13:48:49 +01:00
Alex Gaynor
fd3a066ae3 This function is unused and should have been removed a few releases ago. 2013-02-19 18:05:02 -08:00
Tim Graham
9dde0dc631 Merge pull request #739 from JustinTArthur/ticket-19855 
Fixed typo in legacy database how to
 2013-02-19 15:22:01 -08:00
Tim Graham
132d5822b0 Fixed #19728 - Updated API stability doc to reflect current meaning of "stable". 2013-02-19 18:19:50 -05:00
Justin Turner Arthur
3f49d91463 Fixes typo introduced by django/django@08dc90bccf. This is described in Trac ticket:19855. 2013-02-19 17:03:33 -06:00
Tim Graham
bd006e00e4 Merge pull request #737 from hrbonz/docs_CBV_generic_views_typo 
Fixed typo in docs/topics/class-based-views/generic-display.txt
 2013-02-19 13:30:28 -08:00
Carl Meyer
8fbea5e188 Update 1.5 release notes for XML and formset fixes. 2013-02-19 11:23:30 -07:00
Aymeric Augustin
35c991aa06 Added a default limit to the maximum number of forms in a formset. 
This is a security fix. Disclosure and advisory coming shortly.
 2013-02-19 11:23:30 -07:00
Carl Meyer
1f39eafd60 Checked object permissions on admin history view. 
This is a security fix. Disclosure and advisory coming shortly.

Patch by Russell Keith-Magee.
 2013-02-19 11:23:30 -07:00
Carl Meyer
c6d69c12ea Restrict the XML deserializer to prevent network and entity-expansion DoS attacks. 
This is a security fix. Disclosure and advisory coming shortly.
 2013-02-19 11:23:30 -07:00
Carl Meyer
d51fb74360 Added a new required ALLOWED_HOSTS setting for HTTP host header validation. 
This is a security fix; disclosure and advisory coming shortly.
 2013-02-19 11:23:29 -07:00
Tim Graham
1add79bc40 Fixed #19852 - Updated admin fieldset example for consistency. 
Thanks chris.freeman.pdx@ for the suggestion.
 2013-02-19 12:44:19 -05:00
Tim Graham
00031b73bd Updated a couple admonitions to use the warning directive. 2013-02-19 11:31:41 -05:00