Commit Graph

17536 Commits

Author SHA1 Message Date
Simon Charette 24016c9b62 [1.7.x] Fixed a test failure introduced by 214d1e1b0f.
Backport of 9bc377d7d0 from master
2014-04-18 02:32:24 -04:00
Moayad Mardini 4df5dc42dd [1.7.x] Fixed #22454 - Changed compatibility warning hint
The warning hint of `_check_test_runner` of 1.6 compatibility had a link
to a general release note. The link should be edited to refer the
relevant "Backwards incompatible changes in 1.6" section that documents
the cause and the possible solutions and workarounds of the warning.

Backport of 214d1e1b0f from master
2014-04-17 20:42:04 -04:00
Tim Graham 22cbaea9c7 [1.7.x] Fixed #22444 -- Marked initial SQL/fixture loading as deprecated.
Thanks Karen Tracey for the report.

Backport of a4acb80463 from master
2014-04-17 20:37:25 -04:00
Tim Graham 548acd77fd [1.7.x] Fixed a KeyError on login with legacy sessions; refs #21649.
Thanks Loic for the report.

Backport of 11e30b684d from master
2014-04-17 20:07:05 -04:00
Claude Paroz edaff9b0df [1.7.x] Confirmed support for PostGIS 2.1 and GDAL 1.10
Refs #22456.
Backport of 3cea917e3e from master.
2014-04-17 21:26:49 +02:00
Claude Paroz f039c555ca [1.7.x] Fixed #22456 -- Replaced 900913 EPSG code by 3857 in some tests
3857 is now the official EPSG code for the Google spherical mercator
projection and some recent versions of GDAL do not recognize 900913
any longer.
Thanks Tim Graham for the report and initial patch.
Backport of c082f3c74c from master.
2014-04-17 21:21:27 +02:00
Ben Davis 8c1d8a6215 [1.7.x] Fixed #22220 -- Added more examples to reverse() documention.
Thanks EvilDMP for the suggestions.

Backport of 030dd4f72c from master
2014-04-16 20:31:01 -04:00
Justin Hamade 7f8bd1a4b3 [1.7.x] Fixed #22434 -- Retain ordering on related sliced subqueries.
Thanks maciej.pawlisz for the report, and charettes for the review.

Backport of a13df671a5 from master
2014-04-16 18:02:25 -04:00
Mariano Rezk 841e21a85c [1.7.x] Fixed #22455 -- Documented return values for send_mail and send_mass_mail
Backport of 7cd74fc96e from master.
2014-04-16 17:38:22 -04:00
Motiejus Jakštys 71c8ae543f [1.7.x] Fixed #22460 -- Explicity remove constraints when dropping a related field.
Backport of 0e45669fa9 from master
2014-04-16 16:37:08 -04:00
Jordi Yeh fcbcdf72d6 [1.7.x] Fixed #22457 -- Fixed contributing guide w/o github set-up
The published commnand was not working when the user did not have
the git client set-up with the public-key. Changed the contributing
guide to clone it from https instead.

Backport of 2810299117 from master.
2014-04-16 09:42:48 -04:00
Tim Graham c064971e6b [1.7.x] Fixed spelling errors in documentation.
Backport of b5ce21accb from master
2014-04-16 09:39:25 -04:00
Tim Graham 8edba6eb90 [1.7.x] Fixed #22453 -- Corrected DoesNotExist message in docs.
Thanks Eugenio Cano-Manuel.

Backport of eefad142de from master
2014-04-16 08:37:24 -04:00
Tim Graham 62ac77fa23 [1.7.x] Added a note regarding django.contrib.auth.authenticate.
Thanks Josh Brown for the suggestion.

Backport of ae5b662796 from master
2014-04-16 07:49:33 -04:00
Tim Graham cb7ee25462 [1.7.x] Added RemoteUserMiddleware to middleware reference page.
Backport of 465980d070 from master
2014-04-16 07:23:00 -04:00
Mariano Rezk 5672b29d57 [1.7.x] Fixed #22443 -- Document smtp.EmailBackend.timeout default value
Django 1.7 introduces a new timeout parameter for the SMTP email backend:
http://docs.djangoproject.com/en/dev/topics/email/#django.core.mail.backends.smtp.EmailBackend.timeout

However, there was no mention of the default value for this parameter.

Backport of 4e3d8ae610 from master.
2014-04-15 17:48:45 -04:00
Tim Graham 76ed0a615c [1.7.x] Fixed #22392 -- Corrected deployment instructions for Apache 2.4.
Thanks zjcheah at yahoo.com for the report.

Backport of 0f37d2e4c0 from master
2014-04-15 17:45:39 -04:00
Andrew Godwin a195ec847e [1.7.x] Improve migrations/schema docs 2014-04-14 18:09:48 -04:00
arachnegl f004374f8f [1.7.x] Fixed #22398 -- Added detail about callable in KEY_FUNCTION docs
Backport of 8da86fd19b from master
2014-04-13 19:14:16 -04:00
Simon Charette 9fb61cb64a [1.7.x] Fixed #22350 -- Consistently serialize bytes and text in migrations.
Thanks to @treyhunner and Loïc for their suggestions and review.

Backport of 72d3889db4 from master
2014-04-13 19:03:20 -04:00
valtron 6b3a8d2705 [1.7.x] Fixed #21760 -- prefetch_related used an inefficient query for reverse FK.
Regression introduced by commit 9777442. Refs #21410.

Backport of d3b71b976d from master
2014-04-13 00:51:38 +07:00
Claude Paroz a6eda3a5fc [1.7.x] Also allowed a non-overridden setting to be deleted
Refs #20032, #18824. Thanks ztorstri at gmail.com for the report.
Backport of 3417ba0309 from master.
2014-04-12 15:35:11 +02:00
Claude Paroz d9f8cc12ae [1.7.x] Fixed #22102 -- Made SimpleTestCase tests run before unittest.TestCase ones
Thanks aptiko for the report and Tim Graham for the review.
Backport of 3e3a7372f5 from master.
2014-04-12 11:43:10 +02:00
Aymeric Augustin 3f48ca2071 [1.7.x] Improved a comment. Thanks intgr for the report.
Backport of 476db08 from master
2014-04-11 23:03:25 +02:00
Tim Graham 593e72c141 [1.7.x] Fixed #22419 -- Typo in docs/topics/db/multi-db.txt.
Thanks Josh Kupershmidt.

Backport of c487b1e230 from master
2014-04-10 19:33:39 -04:00
Aymeric Augustin 1bcc8eb0f6 [1.7.x] Increased robustness of 58161e4e. Refs #22291.
Backport of ee837b9a from master
2014-04-10 23:18:36 +02:00
Aymeric Augustin 2ad0bc132a [1.7.x] Fixed #21202 -- Maintained atomicity when the server disconnects.
Thanks intgr for the report.

This commit doesn't include a test because I don't know how to emulate a
database disconnection in a cross-database compatible way.

Also simplified a 'backends' test that was constrained by this problem.

Backport of 81761508 from master
2014-04-10 23:18:36 +02:00
Aymeric Augustin 2e42c859da [1.7.x] Fixed #21239 -- Maintained atomicity when closing the connection.
Refs #15802 -- Reverted #7c657b24 as BaseDatabaseWrapper.close() now
has a proper "finally" clause that may need to preserve self.connection.

Backport of 25860096 from master.
2014-04-10 23:18:35 +02:00
Aymeric Augustin 5f22bda382 [1.7.x] Fixed #22321 -- Wrapped exceptions in _set_autocommit.
Refs #21202.

Backport of 3becac84 from master
2014-04-10 23:06:58 +02:00
Aymeric Augustin 7e89434084 [1.7.x] Fixed #22291 -- Avoided shadowing deadlock exceptions on MySQL.
Thanks err for the report.

Backport of 58161e4e from master.
2014-04-10 23:02:54 +02:00
Tim Graham ae78227de3 [1.7.x] Fixed #21353 -- Noted that description is ignored for TabularInlines.
Thanks nofinator for the report.

Backport of d5031ecf88 from master
2014-04-10 13:33:28 -04:00
John Paulett b4681be154 [1.7.x] Fixed #22364 -- Sanitized getpass input in changepassword.
Python 2 getpass on Windows does not accept unicode, even
when containing on ASCII characters. Related #190807.

Backport of b5a9166f7e from master
2014-04-10 13:16:04 -04:00
Tim Graham ddd25b280f [1.7.x] Fixed #22194 -- Added --list-tags option to check command.
Thanks Elvard for the patch.

Backport of 395d75ea6b from master
2014-04-10 09:44:43 -04:00
Tim Graham 32e6237450 [1.7.x] Fixed #22195 -- Used constants to define built-in tags for check framework.
Thanks Elvard for the patch.

Backport of b513fa5fc6 from master
2014-04-10 08:54:32 -04:00
Carl Meyer 0b43308e2d [1.7.x] Fixed #22412 -- More nuanced advice re template filters and exceptions.
Thanks Tim for review.

Backport of 7e3834adc9 from master
2014-04-10 06:19:02 -04:00
Shai Berger 941f947bfd [1.7.x] Documentation fixes for the select_for_update change.
Refs #22343; thanks Tim Graham for the fixes.

Backport of 59b1d30 from master
2014-04-10 03:43:05 +03:00
Shai Berger 3a9a4570ef [1.7.x] Fixed #22343 -- Disallowed select_for_update in autocommit mode
The ticket was originally about two failing tests, which are
fixed by putting their queries in transactions.

Thanks Tim Graham for the report, Aymeric Augustin for the fix,
and Simon Charette, Tim Graham & Loïc Bistuer for review.

Backport of b990df1d63 from master
2014-04-10 01:44:30 +03:00
Aymeric Augustin f6f188ffc7 [1.7.x] Fixed #21553 -- Ensured unusable database connections get closed.
Backport of 5f2f47f from master
2014-04-09 22:50:21 +02:00
Tim Graham 396d65b580 [1.7.x] Noted that pip is included with Python 3.4 in Windows install guide.
Thanks CHI Cheng.

Backport of 11e7254c3d from master
2014-04-09 07:39:08 -04:00
ejstronge 763b1d55e2 [1.7.x] Fixed small typo in django-admin.txt
The word 'by' seemed to be missing from the first line of the compilemessages command.

Backport of 5ca522b9ed from master
2014-04-09 07:13:37 -04:00
Huu Nguyen f22177a9a3 [1.7.x] Refs #21230 -- removed direct settings manipulation from signed cookies tests
Backport of b9bfcd82f0 from master
2014-04-08 12:15:40 -04:00
Anubhav Joshi 2cb7013179 [1.7.x] Fixed #16205 -- Added an installation for Windows.
Backport of d35d2f61c5 from master
2014-04-08 11:28:58 -04:00
Tim Graham 8158557f22 [1.7.x] Added Python 3.4 to list of supported version in docs/intro/install.txt
Backport of a1fa6fcabc from master
2014-04-08 11:13:36 -04:00
Tim Graham 9063e6ed39 [1.7.x] Fixed casing of "GeoDjango". 2014-04-08 10:12:15 -04:00
Anubhav Joshi d9c7d9eb6e [1.7.x] Fixed #9535 -- Added a reference guide for file upload classes.
Backport of c8c2b8a638 from master
2014-04-08 10:09:01 -04:00
Anubhav Joshi 61b7fcf478 [1.7.x] Fixed #22405 -- Fixed string error in models/queries docs.
Backport of 36de29200e from master.
2014-04-08 13:34:37 +02:00
Yin Jifeng c148d8e730 [1.7.x] Added missing request parameter to get_current_site().
Backport of d6c9bdd825 from master
2014-04-07 09:57:04 -04:00
Tim Graham 32c8579089 [1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries.
(the previous commit included only the test)

Backport of 3cba90f22a from master
2014-04-07 09:06:09 -04:00
Alejandro Gómez 5e74d6cf0a [1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries.
Backport of 7a7f6fccae from master
2014-04-07 08:59:27 -04:00
Tim Graham 38679254bf [1.7.x] Fixed #22216 -- Added Form.non_field_errors to form API doc.
Backport of d2f4553d70 from master
2014-04-05 18:17:13 -04:00