p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,878 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

13878 Commits

Author SHA1 Message Date
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
Tim Graham efa300088f Fixed #18789 - Fixed some text wrap issues with methods in the docs. 
Thanks neixetis@ for the report.
 2013-02-19 10:25:26 -05:00
Aymeric Augustin ebabd77291 Ensured a connection is established when checking the database version. 
Fixed a test broken by 21765c0a. Refs #18135.
 2013-02-19 10:51:24 +01:00
Aymeric Augustin 9a3988ca5a Implemented Oracle version as a cached property. 2013-02-19 10:50:22 +01:00
Stefan "hr" Berder 22d5e4b4af Update docs/topics/class-based-views/generic-display.txt 
simple typo in "Making friendly template contexts"
 2013-02-19 16:01:06 +08:00
Anssi Kääriäinen 4b9fa49bc0 Avoided related_name conflicts in tests 2013-02-19 03:13:13 +02:00
Anssi Kääriäinen 607772b942 Removed accidentally committed file 2013-02-19 01:55:40 +02:00
Florian Hahn 3e71368423 Fixed #10870 -- Added aggreation + generic reverse relation test 2013-02-19 01:42:02 +02:00
Anssi Kääriäinen b4492a8ca4 Fixed #19837 -- Refactored split_exclude() join generation 
The refactoring mainly concentrates on making sure the inner and outer
query agree about the split position. The split position is where the
multijoin happens, and thus the split position also determines the
columns used in the "WHERE col1 IN (SELECT col2 from ...)" condition.

This commit fixes a regression caused by #10790 and commit
69597e5bcc. The regression was caused
by wrong cols in the split position.
 2013-02-19 01:10:49 +02:00
Aymeric Augustin ffcfb19f47 Added required methods in BaseDatabaseWrapper. 
I should have included this in 29628e0b6e.
 2013-02-18 22:51:56 +01:00
Aymeric Augustin 21765c0a6c Implemented PostgreSQL version as a cached property. 2013-02-18 22:49:59 +01:00
Aymeric Augustin 7b8529d206 Removed duplicate caching of mysql_version. 
The manual caching in self.server_version and the cached_property
decorator are redundant.
 2013-02-18 22:13:05 +01:00
Aymeric Augustin 282b2f40cd Fixed #15119 -- Stopped pinging the MySQL server. 2013-02-18 22:12:19 +01:00
Aymeric Augustin aea98e8c53 Simplified MySQL version checking. 
Django used to check the version of MySQL before handling the first
request, which required:
- opening a connection
- closing it, to avoid holding it idle until the first request.

This code isn't necessary any longer since Django dropped support for
some versions of MySQL, and other database backends don't implement a
similar dance. For consistency and maintenability, remove it.

Reverts 4423757c0c.

Closes #18135.
 2013-02-18 21:46:26 +01:00
Aymeric Augustin 29628e0b6e Factored out common code in database backends. 2013-02-18 17:19:09 +01:00
Tim Graham 64d0f89ab1 Fixed #19717 - Removed mentions of "root QuerySet" in docs. 
Thanks julien.aubert.mail@ for the report and James Pic for the patch.
 2013-02-18 09:35:22 -05:00
Aymeric Augustin 92837ae569 Avoided firing the request_finished signal in tests. 
* Avoided calling BaseHttpResponse.close(). The test client take care of
  that since acc5396e.
* Disconnected the request_finished signal when this method must be
  called. The test client has a similar implementation since bacb097a.
 2013-02-18 14:32:45 +01:00
Aymeric Augustin 09ca010768 Removed an unecessary function. 
It was introduced by the refactoring in 5a4e63e6 and made redundant by
the refactoring in 18934677.
 2013-02-18 11:38:21 +01:00
Claude Paroz 5ec0405a09 Fixed #19839 -- Isolated auth tests from customized TEMPLATE_LOADERS 
Thanks limscoder for the report.
 2013-02-18 09:22:25 +01:00
Simon Meers 9c2066d567 Corrected INSTALLED_APPS syntax in 1.5 release notes. 2013-02-18 00:33:29 +11:00
Tim Graham 218bbef0c4 Fixed #19824 - Corrected the class described for Field.primary_key from IntegerField to AutoField. 
Thanks Keryn Knight.
 2013-02-16 18:31:54 -05:00
Tim Graham 7a80904b00 Fixed #19812 - Removed a duplicate phrase in the widget docs. 
Thanks diegueus9 for the report and itsallvoodoo for the draft patch.
 2013-02-16 18:23:39 -05:00
Tim Graham a7358586e9 Merge pull request #730 from phantummm/ticket_19719 
Fixed #19719 - Removed misleading example from ModelForm documentation
 2013-02-16 15:05:04 -08:00