Commit Graph

12111 Commits

Author SHA1 Message Date
Shai Berger d9dc98159d [1.4.x] Fixed #20904: Test failure on Oracle
Just skip the failing test, the failure isn't really relevant; also,
both the test and the reason for its failure were removed in 1.5.

Thanks Tim Graham for advice on 1.5.
2013-08-17 23:12:01 +03:00
Luke Plant d5da495a2e [1.4.x] Fixed #20906 -- Fixed a dependence on set-ordering in tests
Backport of 1ae64e96c1 from master
2013-08-16 17:55:08 -04:00
Anssi Kääriäinen bf611f14ec [1.4.x] Fixed #20905 -- Fixed an Oracle-specific test case failure
Made a test checking ORM-generated query string case-insensitive.

Backport of ee0a7c741e from master
2013-08-16 12:23:05 -04:00
Florian Apolloner 08e5fcb3e6 Fixed regression in validation tests since example.com is available via https now. 2013-08-13 22:34:52 +02:00
Jacob Kaplan-Moss 0d4ef66f7c Bump version post-release. 2013-08-13 12:16:41 -05:00
Tim Graham d77ce64fe8 [1.4.x] Removed 1.5.2 release notes 2013-08-13 13:15:54 -04:00
Jacob Kaplan-Moss 506913cdd8 Stole the Makefile for building packages from master. 2013-08-13 11:24:46 -05:00
Tim Graham e61e20e497 Added 1.4.6/1.5.2 release notes. 2013-08-13 11:18:07 -05:00
Jacob Kaplan-Moss 30e17be1f6 Bumped version numbers for 1.4.6. 2013-08-13 11:09:05 -05:00
Jacob Kaplan-Moss ec67af0bd6 Fixed is_safe_url() to reject URLs that use a scheme other than HTTP/S.
This is a security fix; disclosure to follow shortly.
2013-08-13 11:00:13 -05:00
Tim Graham b50be6857c [1.4.x] Added missing release notes for older versions of Django
Backport of 3f6cc33cff from master
2013-08-12 14:11:10 -04:00
Tim Graham 8af0b1afd2 [1.4.x] Added a bugfix in docutils 0.11 -- docs will now build properly.
Backport of a3a59a3197 from master
2013-07-31 10:14:38 -04:00
SusanTan ed6ec47ff7 [1.4.x] Fixed #20779 -- Documented AdminSite.app_index_template; refs #8498.
Thanks CollinAnderson for the report.

Backport of 7de35a9ef3 from master
2013-07-31 07:09:52 -04:00
mark hellewell f3a961f009 [1.4.x] Fixed #18315 -- Documented QueryDict.popitem and QueryDict.pop
Thanks gcbirzan for the report.

Backport of 8c9240222f from master
2013-07-25 11:09:25 -04:00
Brenton Cleeland eda39fe704 [1.4.x] Fixed #20792 -- Corrected DISALLOWED_USER_AGENTS docs.
Thanks simonb for the report.

Backport of dab52d99fc from master
2013-07-25 07:39:53 -04:00
Matt Deacalion Stevens dfe36f10df [1.4.x] Atom specification URL updated
Changed to the URL of the official RFC for Atom, since Atomenabled.org
is just a holding page.

Backport of beefc97171 from master
2013-07-18 08:48:11 -04:00
Tim Graham 6b4b18e7e2 [1.4.x] Fixed #20756 -- Typo in uWSGI docs.
Backport of a3242dc9fe from master
2013-07-17 06:51:48 -04:00
Tim Graham 288d70fccc [1.4.x] Fixed #20730 -- Fixed "Programmatically creating permissions" error.
Thanks glarrain for the report.

Backport of 684a606a4e from master
2013-07-11 11:10:26 -04:00
Tim Graham e8971345b4 [1.4.x] Fixed #19196 -- Added test/requirements
Backport of 4d92a0bd86 from master
2013-07-10 12:12:15 -04:00
Tim Graham 7b7592cafa [1.4.x] Fixed #18944 -- Documented PasswordResetForm's from_email argument as a backwards incompatible change for 1.3
Thanks DrMeers for the report.

Backport of dab921751d from master
2013-07-08 15:06:45 -04:00
Baptiste Mispelon 165cc1dc2f [1.4.x] Fixed #20665 -- Missing backslash in sitemaps documentation
Backport of 5005303ae7 from master.
2013-06-27 09:45:58 +02:00
Aymeric Augustin e2b86571bf [1.4.x] Fixed oversight in e3b6fed3. Refs #20636. 2013-06-24 21:00:28 +02:00
Aymeric Augustin e3b6fed320 [1.4.x] Fixed #20636 -- Stopped stuffing values in the settings.
In Django < 1.6, override_settings restores the settings module that was
active when the override_settings call was executed, not when it was
run. This can make a difference when override_settings is applied to a
class, since it's executed when the module is imported, not when the
test case is run.

In addition, if the settings module for tests is stored alongside the
tests themselves, importing the settings module can trigger an import
of the tests. Since the settings module isn't fully imported yet,
class-level override_settings statements may store a reference to an
incorrect settings module. Eventually this will result in a crash during
test teardown because the settings module restored by override_settings
won't the one that was active during test setup.

While Django should prevent this situation in the future by failing
loudly in such dubious import sequences, that change won't be backported
to 1.5 and 1.4. However, these versions received the "allowed hosts"
patch and they're prone to "AttributeError: 'Settings' object has no
attribute '_original_allowed_hosts'". To mitigate this regression, this
commits stuffs _original_allowed_hosts on a random module instead of the
settings module.

This problem shouldn't occur in Django 1.6, see #20290, but this patch
will be forward-ported for extra safety.

Also tweaked backup variable names for consistency.

Backport of 0261922 from stable/1.5.x.

Conflicts:
	django/test/utils.py
2013-06-24 20:42:42 +02:00
Tim Graham c97cc85b74 [1.4.x] Fixed #20326 - Corrected form wizard get_form() example.
Thanks tris@ for the report.

Backport of 646a2216e9 from master
2013-05-31 08:09:17 -04:00
Gavin Wahl 9b5fe02215 [1.4.x] Fixed regroup example.
Chicago was missing.

Backport of e6ff238 from master.
2013-05-29 21:52:25 -04:00
Tim Graham 227d7f63e4 [1.4.x] Fixed #20523 - Incorrect form field for FilePathField.
Thanks sane4ka.sh@ for the report.

Backport of 1fdc3d256d from master
2013-05-28 12:00:04 -04:00
Tim Graham 1deeda5785 [1.5.x] Fixed #20492 - Removed a broken link in GIS docs.
Backport of fbab3209fc from master
2013-05-24 12:36:25 -04:00
Alasdair Nicol e149d8ebf0 [1.4.x] Updated link to jQuery Cookie plugin site
Backport of 81f454a322 from master
2013-05-24 12:26:23 -04:00
Wilfred Hughes 528345069d [1.4.x] Fixed a minor spelling mistake in the queryset documentation
Backport of d258cce482 from master
2013-05-14 10:32:38 -04:00
Alex Gaynor 6297673efd [1.5.X] Fixed #18883 -- added a missing self parameter in the docs
Backport of 17d57275f9 from master
2013-05-13 20:50:37 -04:00
Tim Graham fbac080691 [1.4.X] Fixed #18277 - Clarified startproject documentation.
Backport of 33503600b5 from master
2013-03-30 08:38:42 -04:00
Nimesh Ghelani d2b8834839 [1.4.x] Fixed #20150 -- Fixed an error in manager doc example
Backport of 485c024567 from master
2013-03-29 15:55:52 -04:00
Carl Meyer 4c6fb23dd4 [1.4.x] Bump version to no longer claim to be 1.4.5 final. 2013-03-28 15:11:17 -06:00
Donald Stufft 41af26dd53 Merge pull request #962 from dstufft/document-bcrypt-truncation-1.4.x
Document password truncation with BCryptPasswordHasher
2013-03-26 10:32:19 -07:00
Donald Stufft 843034a8d6 Document password truncation with BCryptPasswordHasher 2013-03-26 13:28:55 -04:00
Claude Paroz 577a27a9fc [1.4.x] Fixed #19926 -- Fixed a link to code example in queries docs
Thanks Randy Salvo for the report.
2013-03-02 20:13:47 +01:00
Aymeric Augustin 97a67b26f3 [1.4.x] Fixed #18144 -- Restored compatibility with SHA1 hashes with empty salt.
Thanks dahool for the report and initial version of the patch.

Backport of 633d8de from master.
2013-02-25 20:18:04 +01:00
Tim Graham 52bac4ede1 [1.4.x] Fixed #19911 - Updated generic view links.
Thanks marc@ for the report.
2013-02-25 13:01:15 -05:00
Tim Graham db1e8bdc33 [1.4.x] Fixed #19728 - Updated API stability doc to reflect current meaning of "stable".
Backport of 132d5822b0 from master.
2013-02-25 12:55:12 -05:00
Preston Holmes 0f555f813b [1.4.x] Fixed #19902 -- backport of as_view docs 2013-02-23 19:25:38 -08:00
Anssi Kääriäinen 3872bc51c9 [1.4.x] 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, cherry-pick of 50677b29af
2013-02-21 00:03:39 +02:00
James Bennett 67a937c2c2 [1.4.x] Bump version numbers to roll a clean package. 2013-02-20 13:53:27 -06:00
Carl Meyer 3adfc3f97d [1.4.x] Note that ALLOWED_HOSTS default changes in Django 1.5. 2013-02-20 12:26:54 -07:00
Carl Meyer 4cdfb24c98 [1.4.x] Fixed #19857 -- Fixed broken docs link in project template. 2013-02-19 18:36:44 -07:00
Carl Meyer 5d1791ffd2 [1.4.x] Don't characterize XML vulnerabilities as DoS-only. 2013-02-19 18:22:22 -07:00
James Bennett f61f800c29 [1.4.x] Bump version numbers for security release. 2013-02-19 14:17:23 -06:00
Carl Meyer 62d5338bf2 [1.4.x] Update 1.4.4 release notes for all security fixes. 2013-02-19 11:48:46 -07:00
Aymeric Augustin 0cc350a896 [1.4.x] 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 10:37:54 -07:00
Carl Meyer 0e7861aec7 [1.4.x] 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 10:37:54 -07:00
Carl Meyer 1c60d07ba2 [1.4.x] 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 10:37:54 -07:00