mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-19 17:19:12 +00:00
Code Issues 32 Releases Wiki Activity
18,736 Commits 29 Branches 451 Tags
Commit Graph

5728 Commits

Author SHA1 Message Date
Florian Apolloner
8a01c6b531 [1.7.x] Fixed a settings leak possibility in the date template filter. 
This is a security fix.
 2015-11-16 21:06:32 -05:00
Tim Graham
a4973c8f28 [1.7.x] Bumped mysqlclient test requirement to >= 1.3.7. 
mysqlclient 1.3.7 fixes the test failures caused by 1.3.6.

Backport of 2514e044a7fce58176c4e79eec298f3d8f70e89b from master
 2015-11-12 21:35:30 -05:00
Simon Charette
fd1426570e [1.7.x] Refs #25693 -- Added a regression test for to_attr validation on forward m2m. 
Backport of cc8c02fa0fa2119704d1c39ca8509850aef84acc from master
 2015-11-11 12:42:53 -05:00
Ian Foote
6184cb9baa [1.7.x] Fixed #25693 -- Prevented data loss with Prefetch and ManyToManyField. 
Thanks to Jamie Matthews for finding and explaining the bug.

Backport of 4608573788c04fc047da42b4b7b48fdee8136ad3 from master
 2015-11-11 00:58:53 -05:00
Tim Graham
fc94944183 [1.7.x] Added a version requirement to python-memcached in test requirements. 
Backport of 12a62e7e4b8e6d1136aa4457619449cbbcf9dd7c from master
 2015-09-17 15:12:06 -04:00
Tim Graham
5c603a178b [1.7.x] Added a version requirement to mysqlclient in test requirements. 
Backport of fc8a6a9b002aef90ff68f3d95e560db1ea728c76 from master
 2015-09-17 15:11:48 -04:00
Tim Graham
c0f9957cea [1.7.x] Fixed typo in tests/migrations/test_autodetector.py. 
Backport of 01966bb2a779f68d1a371acb1bf814fac7bb5132 from master
 2015-08-20 14:52:41 -04:00
Tim Graham
ae49b4d994 [1.7.x] Prevented newlines from being accepted in some validators. 
This is a security fix; disclosure to follow shortly.

Thanks to Sjoerd Job Postmus for the report and draft patch.
 2015-07-08 07:35:43 -04:00
Marten Kenbeek
9bd3a2325e [1.7.x] Refs #23621 -- Fixed warning message when reloading models. 
Backport of aabb58428beae0bd34f32e5d620a82486b670499 from master
 2015-06-30 15:01:28 -04:00
Tim Graham
207da07d59 [1.7.x] Fixed #24903 -- Fixed assertRaisesMessage on Python 2.7.10. 
A regression found in in Python 2.7.10 rc1 wasn't reverted for the final
release: https://bugs.python.org/issue24134

Backport of two commits from master:
* c2bc1cefdcbbf074408f4a4cace88b315cf9d652
* e89c3a46035e9fe17c373a6c9cd63b9fd631d596
 2015-06-09 16:14:49 -04:00
Andriy Sokolovskiy
927d90ee1e [1.7.x] Fixed #24817 -- Prevented loss of null info in MySQL field renaming. 
Backport of 80ad5472ce4b6ba6e94227422d0727371e97cdf0 from master
 2015-05-28 10:26:27 -04:00
Shai Berger
773ec512b1 [1.7.x] Fixed #24595 Oracle test failure 
The only problem for Oracle was the test, which tested nullity on
text/char fields -- but Oracle interprets_empty_strings_as_null.

Backport of d5a0acc from master
 2015-04-18 19:17:10 +03:00
Claude Paroz
ada0845dda [1.7.x] Fixed #24595 -- Prevented loss of null info in MySQL field alteration 
Thanks Simon Percivall for the report, and Simon Charette and Tim
Graham for the reviews.
Backport of 02260ea3f61b from master.
 2015-04-17 10:48:13 +02:00
Anssi Kääriäinen
c3a9820251 [1.7.x] Fixed #24605 -- Fixed incorrect reference to alias in subquery. 
Thanks to charettes and priidukull for investigating the issue, and to
kurevin for the report.

Backport of 355c5edd9390caad5725375abca03460805f663b from master
 2015-04-16 09:32:23 -04:00
Tim Graham
2a4113dbd5 [1.7.x] Made is_safe_url() reject URLs that start with control characters. 
This is a security fix; disclosure to follow shortly.
 2015-03-18 08:51:51 -04:00
Tim Graham
e63363f8e0 [1.7.x] Fixed an infinite loop possibility in strip_tags(). 
This is a security fix; disclosure to follow shortly.
 2015-03-18 08:51:21 -04:00
John Giannelos
cb48e192fb [1.7.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging. 
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a from master
 2015-03-16 19:58:08 -04:00
Matthew Wilkes
d0607a7eee [1.7.x] Fixed #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change 2015-03-14 15:35:16 -04:00
Baptiste Mispelon
2654e1b939 [1.7.x] Fixed #24461 -- Fixed XSS issue in ModelAdmin.readonly_fields 2015-03-09 10:17:54 -04:00
Jean-Louis Fuchs
283b630d63 Fixed #24447 -- Made migrations add FK constraints for existing columns 
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060feaee6bbd76a0d575487682bc541111e4 from master
 2015-03-07 14:30:28 +01:00
Gabriel Muñumel
0831a43c3a [1.7.x] Fixed #24352 -- Fixed crash when coercing `ManyRelatedManager` to a string. 2015-02-26 11:00:52 -05:00
Aymeric Augustin
9b7d512d5f [1.7.x] Fixed #24318 -- Set the transaction isolation level with psycopg >= 2.4.2. 
Backport of 76356d96 from master
 2015-02-14 18:52:53 +01:00
Markus Holtermann
37b50db092 [1.7.x] Refs #24236 -- Added regression test for 3d4a826174b7a411a03be39725e60c940944a7fe 
Thanks irc user ris for the report
 2015-02-09 16:48:51 +01:00
Andriy Sokolovskiy
3d4a826174 [1.7.x] Fixed #24104 -- Fixed check to look on field.get_internal_type() instead of class instance 2015-01-27 14:40:39 +01:00
Claude Paroz
b1bf8d64fb [1.7.x] Fixed #24193 -- Prevented unclosed file warnings in static.serve() 
This regression was caused by 818e59a3f0. The patch is a partial
backport of the new FileResponse class available in later Django
versions.
Thanks Raphaël Hertzog for the report, and Tim Graham and Collin
Anderson for the reviews.
 2015-01-23 08:58:34 +01:00
Markus Holtermann
70845c6809 [1.7.x] Refs #24163 -- Fixed failing Oracle test when migrating from ForeignKey to OneToOneField 
Thanks Tim Graham for review

Backport of 64ecb3f07db4be5eef4d9eb7687f783ee446c82f from master
 2015-01-20 17:46:37 +01:00
Tim Graham
7a1ccc0699 [1.7.x] Fixed #24153 -- Fixed cookie test compatibility with Python 3.4.3+ 
Backport of b19b81b3960ec2090d40be65547502a3386a769b from master
 2015-01-19 15:41:29 -05:00
Markus Holtermann
db2a97870d [1.7.x] Fixed #24163 -- Removed unique constraint after index on MySQL 
Thanks Łukasz Harasimowicz for the report.

Backport of 5792e6a88c1444d4ec84abe62077338ad3765b80 from master
 2015-01-19 17:25:05 +01:00
Markus Holtermann
29737a2949 [1.7.x] Cleaned up migration writer tests 
Backport of 65d55c409343aab7c2ae771c459720ef797b4cdb from master
 2015-01-17 20:45:41 +01:00
Collin Anderson
cef3f805c2 [1.7.x] Fixed #24160 -- Fixed model_regress test on Windows; refs #24007. 
Backport of 5338ff4808c822a8b00e90154b884b7be3011e60 from master
 2015-01-16 12:03:15 -05:00
Tim Graham
433e7dd507 [1.7.x] Fixed #23312 -- Marked an i18n test as expectedFailure on Windows/Python 3. 2015-01-16 10:31:49 -05:00
Tim Graham
065b2a82f6 [1.7.x] Fixed #24135 -- Made RenameModel rename many-to-many tables. 
Thanks Simon and Markus for reviews.

Backport of 28db4af80a319485c0da724d692e2f8396aa57e3 from master
 2015-01-15 20:43:49 -05:00
Tim Graham
02c059ff7f [1.7.x] Fixed a static view test on Windows. 
Backport of a6f144fd4fee0090de3a99b1f50a4142722e7946 from master
 2015-01-14 13:57:10 -05:00
Tim Graham
bcfb47780c [1.7.x] Fixed DoS possibility in ModelMultipleChoiceField. 
This is a security fix. Disclosure following shortly.

Thanks Keryn Knight for the report and initial patch.
 2015-01-13 13:02:56 -05:00
Tim Graham
818e59a3f0 [1.7.x] Prevented views.static.serve() from using large memory on large files. 
This is a security fix. Disclosure following shortly.
 2015-01-13 13:02:56 -05:00
Tim Graham
de67dedc77 [1.7.x] Fixed is_safe_url() to handle leading whitespace. 
This is a security fix. Disclosure following shortly.
 2015-01-13 13:02:56 -05:00
Carl Meyer
41b4bc73ee [1.7.x] Stripped headers containing underscores to prevent spoofing in WSGI environ. 
This is a security fix. Disclosure following shortly.

Thanks to Jedediah Smith for the report.
 2015-01-13 13:02:56 -05:00
Markus Holtermann
ef5889409b [1.7.x] Fixed #24110 -- Rewrote migration unapply to preserve intermediate states 
Backport of fdc2cc948725866212a9bcc97b9b7cf21bb49b90 and be158e36251df0b07556657da47cdaf10913c57a from master
 2015-01-11 00:35:49 +01:00
Claude Paroz
7e65876b7c [1.7.x] Fixed #24097 -- Prevented AttributeError in redirect_to_login 
Thanks Peter Schmidt for the report and the initial patch.
Thanks to Oktay Sancak for writing the original failing test and
Alvin Savoy for supporting contributing back to the community.
Backport of d7bc37d61 from master.
 2015-01-10 10:13:50 +01:00
Tim Graham
bbcbacf0ad [1.7.x] Silenced deprecation warning in test_runner app. 2015-01-08 09:44:21 -05:00
Tim Graham
600ea43e67 [1.7.x] Silenced initial_data fixtures warning in test suite. 2015-01-08 09:43:40 -05:00
Tim Graham
557c514f90 [1.7.x] Fixed #24095 -- Prevented WarningLoggerTests from leaking a warnings filter. 
Backport of ade985999657eaef6a9510c2aeba9b2196d7bf6e from master
 2015-01-08 09:09:24 -05:00
Claude Paroz
d8fb557a51 [1.7.x] Fixed #23815 -- Prevented UnicodeDecodeError in CSRF middleware 
Thanks codeitloadit for the report, living180 for investigations
and Tim Graham for the review.
Backport of 27dd7e7271 from master.
 2015-01-06 08:45:10 +01:00
Andrey Maslov
8de2a44064 [1.7.x] Fixed #24008 -- Fixed ValidationError crash with list of dicts. 
Backport of 7a878ca5cb50ad65fc465cb263a44cc93629f75c from master
 2014-12-31 14:46:17 -05:00
Tim Graham
4abfa73c18 [1.7.x] Renamed tests for util -> utils moves; refs #17627. 
Backport of 8a9b0c15a6c0ef60dea3ba3042317520bc201206 from master
 2014-12-31 11:33:27 -05:00
Tim Graham
c0bed63889 [1.7.x] Fixed a queries test on Python 2 broken after importing six.moves.range(). 
Backport of 837fc2d8cdfefce375697d95e241836c7be12696 from master
 2014-12-31 09:51:10 -05:00
Piotr Pawlaczek
e11ff3975f [1.7.x] Fixed #23758 -- Allowed more than 5 levels of subqueries 
Refactored bump_prefix() to avoid infinite loop and allow more than
than 5 subquires by extending the alphabet to use multi-letters.

Backport of 41fc1c0b5eac156e200a10233c7c9210a1c0fed8 from master
 2014-12-31 09:42:07 -05:00
Markus Holtermann
d49b5851b4 [1.7.x] Added test for an intermediate swappable model change in migration state. 
refs #22563

Backport of fca866763acb6b3414c20ca3772b94cb5d111733 from master
 2014-12-30 10:03:41 -05:00
Tim Graham
a9da5dd5b6 [1.7.x] Fixed #23581 -- Prevented extraneous DROP DEFAULT statements. 
Thanks john_scott for the report and Markus Holtermann for review.

Backport of ab4f709da4516672b0bd811f2b4d0c4ba9f5b636 from master
 2014-12-30 08:31:18 -05:00
Tim Graham
79645529e7 Revert "[1.7.x] Fixed #23938 -- Added migration support for m2m to concrete fields and vice versa" 
This reverts commit 1702bc52cc20ed0729893177fc8f4391b4b3183c.

This doesn't work on stable/1.7.x because #23844 wasn't backported and we're
not willing to do so because it's a large change.
 2014-12-29 15:37:15 -05:00