Commit Graph

18321 Commits

Author SHA1 Message Date
Markus Holtermann 21358e7225 [1.7.x] Fixed #23614 -- Changed the way the migration autodetector orders unique/index_together
Thanks to Naddiseo for the report and Tim Graham for the review

Backport of 5c9c1e029d from master
2014-10-29 13:16:23 -04:00
Tim Graham bb42bab6d3 [1.7.x] Fixed #23719 -- Fixed MySQL 5.6 crash with GeometryFields in migrations.
Backport of 03bd79ed2 from master
2014-10-29 08:25:59 -04:00
Berker Peksag d73c7e5db6 [1.7.x] Limited lines to 119 characters in django/{contrib,db}.
Refs #23395.

Backport of c9178ef17a (to decrease chance of backport conflicts) from master
2014-10-29 08:01:35 -04:00
Oliver Meinusch 9766ed6a0e [1.7.x] Fixed QuerySet datetimes argument name in docs.
Backport of 6b39401baf from master
2014-10-27 19:49:50 -04:00
Tim Graham b7231e39a4 [1.7.x] Fixed #23708 -- Corrected mod_wsgi docs reference to nonexistent comment in wsgi.py.
Thanks inglesp for the report.

Backport of e460b1c573 from master
2014-10-27 18:20:18 -04:00
bahoo dea3eefa72 [1.7.x] Fixed typo in squashing migrations documentation
Backport of af7d66b4f2 from master
2014-10-27 17:53:34 -04:00
Claude Paroz a0cfd77971 [1.7.x] Added GeoDjango compatibility with mysqlclient driver
Thanks Tim Graham for helping on that issue.
2014-10-27 16:10:35 +01:00
Claude Paroz 0a4183dfe6 [1.7.x] Fixed typo in MySQL backend doctring
Thanks CHI Cheng for the report.
2014-10-27 14:03:15 +01:00
Claude Paroz 6a1bd837b1 [1.7.x] Fixed #23717 -- Fixed makemessages crash when STATIC_ROOT=None
Backport of 528c9af54 from master.
2014-10-27 13:59:09 +01:00
Tim Graham abee4f718e [1.7.x] Fixed stable/1.7.x test failures from refs #23699. 2014-10-27 08:19:57 -04:00
Tim Graham af1c85e851 [1.7.x] Fixed flake8 warning.
Backport of ef9e3c5ed8 from master
2014-10-27 07:13:47 -04:00
Tim Graham 6149a0ab18 [1.7.x] Edited release note for refs #23621. 2014-10-27 07:13:23 -04:00
Tim Graham 5cc8180a65 [1.7.x] Fixed #23699 -- Prevented flush from loading initial data for apps with migrations.
Backport of dd1ea70779 from master.
2014-10-27 07:13:05 -04:00
Tim Graham e317d7fc72 [1.7.x] Fixed documentation of make_password kwargs.
Backport of ed7c4df1ee from master
2014-10-27 06:44:18 -04:00
Claude Paroz b42930e4b7 [1.7.x] Fixed #23446 -- Officially recommended mysqlclient as MySQL driver
Thanks Corey Farwell for the report and Tim Graham for the review.
Thanks also to Inada Naoki for creating and maintaining mysqlclient.
Backport of 7f089ac2e3 from master.
2014-10-27 09:17:31 +01:00
Loic Bistuer 7fa6781f81 [1.7.x] Fixed #23621 -- Warn for duplicate models when a module is reloaded.
Previously a RuntimeError was raised every time two models clashed
in the app registry. This prevented reloading a module in a REPL;
while it's not recommended to do so, we decided not to forbid this
use-case by turning the error into a warning.

Thanks dfunckt and Sergey Pashinin for the initial patches.

Backport of 8c4ca16c65 and b62f72498a from master
2014-10-26 00:12:17 +07:00
Berker Peksag 7227ec8ecc [1.7.x] Removed simplejson inventory file from docs/conf.py.
Backport of 695956376f from master
2014-10-25 08:21:49 -04:00
Tim Graham 03a20e5abd [1.7.x] Fixed #23692 -- Removed alpha/beta/rc release notes.
Backport of 740934b507 from master
2014-10-25 08:20:04 -04:00
Tim Graham 6f2658aa34 [1.7.x] Replaced dead links to python-distribute.org.
Backport of dc241fdfdf from master
2014-10-24 18:59:17 -04:00
Berker Peksag 17c09704ab [1.7.x] Fixed versionchanged indentation in topics/testing/advanced.txt.
Backport of 1387c80643 from master
2014-10-24 15:41:43 -04:00
James Doherty 69b5428c12 [1.7.x] Fixed typo in docs/ref/request-response.txt
Backport of adf8fb34ce from master
2014-10-24 07:49:47 -04:00
Tim Graham 7750fc8fa8 [1.7.x] Fixed #23702 -- Fixed adding an explicit id field on SQLite.
Thanks gavinwahl for the report.

Backport of 92269b7b53 from master
2014-10-23 14:35:55 -04:00
Tim Graham ba6a599ce4 [1.7.x] Fixed #23705 -- Removed unnecessary AliasMatch from example Apache config.
Thanks Keryn Knight for the report.

Backport of 4b0a45ce64 from master
2014-10-23 08:51:14 -04:00
Tim Graham f70a733abc [1.7.x] Fixed #23630 -- Made AlterModelTable rename auto-created M2M tables.
Thanks Naddiseo for the report, Andrew Godwin for guidance,
and Shai Berger for review.

Backport of 41b337efa0 from master
2014-10-23 08:51:08 -04:00
Berker Peksag 41d5222a6a [1.7.x] Fixed versionchanged indentation in unit-tests.txt.
Backport of 22c85bf1a8 from master
2014-10-23 08:04:17 -04:00
Tim Graham 7db89f79b3 [1.7.x] Added a warning about running migrations with DEBUG=True.
Thanks Charles Lanahann for the report.
2014-10-22 14:12:47 -04:00
Tim Graham 81095a1ae5 [1.7.x] Added stub release notes for 1.7.2.
Backport of 4bf86d25e5 from master
2014-10-22 13:39:27 -04:00
Tim Graham c4092e8bde [1.7.x] Post-release version bump. 2014-10-22 13:29:56 -04:00
James Bennett c5780adeec [1.7.x] Bump version number for bugfix release. 2014-10-22 12:56:07 -04:00
Tim Graham 0f9b4b5a90 [1.7.x] Added release dates to release notes.
Backport of 9dc782b631 from master
2014-10-22 12:24:13 -04:00
Claude Paroz d5a273eadb [1.7.x] Fixed #23583 -- More selectively ignored static/media roots
Fixed a regression introduced by 28efafa24c.
Thanks Michal Čihař for the report and initial patch, and
Collin Anderson and Tim Graham for the reviews.
Backport of 8b4cc9df9c from master.
2014-10-21 20:20:26 +02:00
Claude Paroz 53bc81dca3 [1.7.x] Fixed #21740 -- Allowed test client data to be an empty string
This fixes a regression introduced by 2a31d00933.
Thanks tony-zhu for the report.
Backport of f0bb3c98cc from master.
2014-10-21 09:17:42 +02:00
Simon Charette 117e970610 [1.7.x] Fixed a flake8 warning.
Backport of f6c208d95c from master
2014-10-20 13:17:00 -04:00
Tianyi Wang 3f3bed8fb9 [1.7.x] Fixed #23629 -- Allowed autodetector to detect changes in Meta.db_table.
Thanks Naddiseo for reporting.

Backport of 5732424bee from master
2014-10-20 13:15:34 -04:00
Tim Graham 417923c69e [1.7.x] Fixed #20609 -- Added instructions for using AnonymousUser with RequestFactory.
Backport of a39df37049 from master
2014-10-20 10:52:36 -04:00
wrwrwr a2ebbf8916 [1.7.x] Fixed a typo in urlencode documentation.
Backport of 62a53bdf11 from master
2014-10-19 19:20:28 -04:00
Jon Dufresne 37ab955d69 [1.7.x] Fixed #23676 -- Rearranged sentence; "by default" applies only to max length
Backport of c1b9f99a81 from master
2014-10-18 06:56:12 -04:00
Tim Graham 55a5f0b49a [1.7.x] Added 1.7.1 release notes for refs #23649.
Backport of 6ce6c77e03 from master
2014-10-17 08:57:15 -04:00
Shai Berger a1578055e6 [1.7.x] Fixed #23649 -- Made Oracle test-db creation drop test-user earlier when needed
Checked database destruction for ORA-29857, which happens when objects of
some types are left over in an old test database (notably, such objects
are created by the GIS backend). When this happens, we can resolve the
issue by dropping the test-user (if we are allowed to).

An alternative approach, to just switch the order of creation (so that,
if the test user exists and can be dropped, it is always dropped before
the tablespace) was considered; but since the user creation depends on
the tablespace, this would necessitate separating the dropping of the user
from its creation -- a change I am reluctant to make.

Thanks Josh Smeaton and Tim Graham for reviews.

Backport of 2e1ed5f33c from master
2014-10-17 04:58:31 +03:00
Tim Graham 0569e0dd74 [1.7.x] Fixed some intersphinx references.
Backport of babbf18999 from master
2014-10-16 20:02:23 -04:00
Tim Graham a1a54b00d2 [1.7.x] Fixed #23667 -- Incorrect settings reference for language cookie.
Thanks jamesbeith for the report.

Backport of bedd439297 from master
2014-10-16 19:42:05 -04:00
Rigel Di Scala e8262b5941 [1.7.x] Fixed #23615 -- Validate that a Model instance's "check" attribute is a method.
The "check" name is a reserved word used by Django's check framework,
and cannot be redefined as something else other than a method, or the check
framework will raise an error.

This change amends the django.core.checks.model_check.check_all_models()
function, so that it verifies that a model instance's attribute "check"
is actually a method. This new check is assigned the id "models.E020".

Conflicts:
	docs/ref/checks.txt

Backport of a5c77417a6 from master
2014-10-17 00:36:43 +07:00
mcgeeco b729ef0bda [1.7.x] Fixed #12008 -- Clarified relationship between template blocks and includes.
Thanks Daniele Procida for suggested wording.

Backport of 80b8d3bee0 from master
2014-10-16 10:54:35 -04:00
Ian Lee 813954f15a [1.7.x] Fixed pep8 in docs/topics/logging.txt
Backport of 947af46db3 from master
2014-10-15 18:56:00 -04:00
Claude Paroz da0ebe39f6 [1.7.x] Fixed #23651 -- Isolated non-existent fixture tests
Previous versions of the tests were buggy, as initial_data.json
did exist and the test wasn't failing. It was finally failing on
Python 3.4.2.
Thanks Raphaël Hertzog for the report (and Debian bug #765117
contributors).
Backport of 7a893ee771 from master.
2014-10-15 09:18:14 +02:00
Claude Paroz 555952c3e6 [1.7.x] Adapted invalid cookie test to all Python versions
Refs #23638. Older Python versions are less strict when parsing
invalid cookie content. The test just has to ensure Django doesn't
crash.
2014-10-14 09:59:14 +02:00
Claude Paroz 6398ebab93 [1.7.x] Fixed #23638 -- Prevented crash while parsing invalid cookie content
Thanks Philip Gatt for the report and Tim Graham for the review.
Backport of 59d487e7fc from master.
2014-10-13 17:39:23 +02:00
Florian Apolloner bc13a08f89 [1.7.x] Fixed #23063 -- Convert \n and \r to \r\n when using the SMTP backend as per RFC.
Backport of 8d789449c7 from master.
2014-10-12 22:03:01 +02:00
Dori d2a2af67f7 [1.7.x] Fixed #23639 -- Fixed doc error in RegexValidator.regex
Thanks to @claudep for the report and the original patch.

Backport of c48a29a02a from master.
2014-10-12 13:02:27 +01:00
Tim Graham 625480cf08 [1.7.x] Fixed #23631 -- Removed outdated note on MySQL timezone support.
Thanks marfire for the report.

Backport of 9db3653670 from master
2014-10-10 15:22:36 -04:00