mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
Code Issues 25 Releases Wiki Activity
17,507 Commits 28 Branches 426 Tags 666 MiB
380545bf85
Commit Graph

17507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aymeric Augustin
380545bf85 [1.7.x] Prevented leaking the CSRF token through caching. 
This is a security fix. Disclosure will follow shortly.

Backport of c083e3815a from master
 2014-04-21 18:29:24 -04:00
Tim Graham
546740544d [1.7.x] Fixed a remote code execution vulnerabilty in URL reversing. 
Thanks Benjamin Bach for the report and initial patch.

This is a security fix; disclosure to follow shortly.

Backport of 8b93b31487 from master
 2014-04-21 18:29:12 -04:00
Matt Lauber
0bd913a19c [1.7.x] Corrected the section identifier for MySQL unicode reference. 
Backport of b2514c02e1 from master
 2014-04-21 13:20:46 -04:00
Florian Apolloner
d7de6ed07e [1.7.x] Fixed monkeypatching in a staticfiles test. 
Backport of a4553e0510 from master
 2014-04-21 08:58:41 -04:00
Aymeric Augustin
62eb79fc4c [1.7.x] Appeased flake8 2.1.0. 
Backport of 428c0bbe1b from master
 2014-04-21 07:50:50 -04:00
Alex Gaynor
50dddbdfc7 [1.7.x] Corrected many style guide violations that the newest version of flake8 catches 
Backport of 778ce245dd from master
 2014-04-21 07:50:43 -04:00
Aymeric Augustin
0dad0ca55e [1.7.x] Further consolidated the model_inheritance tests. 
Backport of 3f01e82 from master
 2014-04-21 11:51:21 +02:00
Aymeric Augustin
ab0afef959 [1.7.x] Fixed #22402 -- Consolidated model_inheritance tests. 
The model_inheritance_same_model_name tests couldn't be run without the
model_inheritance tests. Make the problem go away by merging them.

Thanks timo for the report.

Backport of 0097d38 from master
 2014-04-21 11:43:38 +02:00
Simon Charette
33d1dc2eeb [1.7.x] Fixed flake8 warnings introduced in recent commits. 
Backport of 79f05616fb from master
 2014-04-20 13:10:52 -04:00
Tim Graham
9e86c3f0a6 [1.7.x] Fixed flake8 errors. 
Backport of 471fb04a30 from master
 2014-04-20 13:09:12 -04:00
Tim Graham
0086c9eb48 [1.7.x] Fixed #22417 -- Added additional documentation for refs #16969. 
Thanks Jon Foster for the report.

Backport of 1b3a3fc1e4 from master
 2014-04-19 21:41:28 -04:00
Andrew Gorcester
bc5d568e1e [1.7.x] Fixed #22397 -- Issues removing M2M field with explicit through model 
Changed the migration autodetector to remove models last so that FK
and M2M fields will not be left as dangling references. Added a check
in the migration state renderer to error out in the presence of
dangling references instead of leaving them as strings. Fixed a bug
in the sqlite backend to handle the deletion of M2M fields with
"through" models properly (i.e., do nothing successfully).

Thanks to melinath for report, loic for tests and andrewgodwin and
charettes for assistance with architecture.

Backport of 956bd64424 from master
 2014-04-18 18:34:00 -04:00
Tim Graham
b06e45bbf6 [1.7.x] Moved RemoteUserBackend documentation to reference guide. 
Backport of 26d118c3fe from master
 2014-04-18 16:11:04 -04:00
Moayad Mardini
b1e7dd445b [1.7.x] Fixed #22458 -- Added a note about MySQL utf8_unicode_ci collation 
Thanks tobami at gmail.com for the report.

Backport of 11ac50b18e from master
 2014-04-18 15:11:10 -04:00
Tim Graham
1816baf4f7 [1.7.x] Fixed #22472 -- Clarified meaning of dots in tutorial 4 code block. 
Backport of 6b2ce38c49 from master
 2014-04-18 15:03:57 -04:00
Tim Graham
a9ad081899 [1.7.x] Fixed #22473 -- Emphasized that Model.clean() is not called from Model.save(). 
Backport of b43bbd6d39 from master
 2014-04-18 15:03:27 -04:00
Claude Paroz
13340df769 [1.7.x] Adapted fixture read mode to file type 
Binary mode added in ed532a6a1e is not supported by ZipFile.
Refs #22399.
Backport of 275811a93 from master.
 2014-04-18 19:24:39 +02:00
Claude Paroz
8d7023dc71 [1.7.x] Fixed #22399 -- Forced fixture reading in binary mode 
This might help on systems where default encoding is not UTF-8 (and
on Python 3).
Thanks bacilla for the report.
Backport of ed532a6a1 from master.
 2014-04-18 17:56:14 +02:00
Tim Graham
3a4a5a5c99 [1.7.x] Added some missing items to the 1.6.3 release notes. 
Backport of c2b269df6e from master
 2014-04-18 10:32:49 -04:00
Erik Romijn
1dc4a8daec [1.7.x] Fixed #22471 -- Corrected misprint in i18n docs 
Backport of 54d5c37de6 from master.
 2014-04-18 15:09:58 +02:00
Moayad Mardini
bdfa3fd9b3 [1.7.x] Fixed #22464 - included contrib/gis/static in tarball 
After switching to setuptools in commit 66f546b,
contrib/gis/static isn't included in tarball anymore, this commit adds
that path to be `recursive-include` in `MANIFEST.in`

Backport of bad4721b45 from master
 2014-04-18 07:18:51 -04:00
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