innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
18,547 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

5701 Commits

Author SHA1 Message Date
Markus Holtermann db2a97870d [1.7.x] Fixed #24163 -- Removed unique constraint after index on MySQL 
Thanks Łukasz Harasimowicz for the report.

Backport of 5792e6a88c from master
 2015-01-19 17:25:05 +01:00
Markus Holtermann 29737a2949 [1.7.x] Cleaned up migration writer tests 
Backport of 65d55c4093 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 5338ff4808 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 28db4af80a 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 a6f144fd4f 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 fdc2cc9487 and be158e3625 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 ade9859996 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 7a878ca5cb 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 8a9b0c15a6 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 837fc2d8cd 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 41fc1c0b5e 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 fca866763a 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 ab4f709da4 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 1702bc52cc.

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
Markus Holtermann 1702bc52cc [1.7.x] Fixed #23938 -- Added migration support for m2m to concrete fields and vice versa 
Thanks to Michael D. Hoyle for the report and Tim Graham for the review.

Backport of 623ccdd598 from master
 2014-12-29 13:42:29 -05:00
Aymeric Augustin 3483682749 [1.7.x] Fixed #23831 -- Supported strings escaped by third-party libs in Django. 
Refs #7261 -- Made strings escaped by Django usable in third-party libs.

The changes in mark_safe and mark_for_escaping are straightforward. The
more tricky part is to handle correctly objects that implement __html__.

Historically escape() has escaped SafeData. Even if that doesn't seem a
good behavior, changing it would create security concerns. Therefore
support for __html__() was only added to conditional_escape() where this
concern doesn't exist.

Then using conditional_escape() instead of escape() in the Django
template engine makes it understand data escaped by other libraries.

Template filter |escape accounts for __html__() when it's available.
|force_escape forces the use of Django's HTML escaping implementation.

Here's why the change in render_value_in_context() is safe. Before Django
1.7 conditional_escape() was implemented as follows:

    if isinstance(text, SafeData):
        return text
    else:
        return escape(text)

render_value_in_context() never called escape() on SafeData. Therefore
replacing escape() with conditional_escape() doesn't change the
autoescaping logic as it was originally intended.

This change should be backported to Django 1.7 because it corrects a
feature added in Django 1.7.

Thanks mitsuhiko for the report.

Backport of 6d52f6f from master.
 2014-12-27 18:26:20 +01:00
Aymeric Augustin b429a9796a [1.7.x] Fixed an inconsistency introduced in 547b1810. 
mark_safe and mark_for_escaping should have been kept similar.

On Python 2 this change has no effect. On Python 3 it fixes the use case
shown in the regression test for mark_for_escaping, which used to raise
a TypeError. The regression test for mark_safe is just for completeness.

Backport of 5c5eb5fe from master.
 2014-12-27 18:17:18 +01:00
Claude Paroz 322560489b [1.7.x] Fixed #24051 -- Made schema infrastructure honor tablespaces 
Partial backport of 30cbd5d36. Thanks Douglas J. Reynolds for the
report and initial patch.
 2014-12-27 15:12:17 +01:00
Tim Graham 51ea30a43b [1.7.x] Fixed #24037 -- Prevented data loss possibility when changing Meta.managed. 
The migrations autodetector now issues AlterModelOptions operations for
Meta.managed changes instead of DeleteModel + CreateModel.

Thanks iambibhas for the report and Simon and Markus for review.

Backport of 061caa5b38 from master
 2014-12-23 14:26:56 -05:00
Oscar Ramirez 1ad5deedd4 [1.7.x] Fixed #23998 -- Added datetime.time support to migrations questioner. 
Backport of 54085b0f9b from master
 2014-12-22 07:26:57 -05:00
Claude Paroz ea18652238 [1.7.x] Made model_regress unpickling test CWD-independent 
Refs #24007. Thanks Tim Graham for his help with the patch.

Backport of 1d9fc5caa9 and
995be4a137 from master
 2014-12-19 14:26:46 -05:00
Claude Paroz f46a16614d [1.7.x] Fixed #24015 -- Factorized create_index_sql expression 
Backport of 6072f17d0 from master, with one test reinforced.
Thanks Tim Graham for the review.
 2014-12-18 21:14:29 +01:00
Claude Paroz 47912d9f2b [1.7.x] Fixed #24007 -- Ensure apps registry's ready before unpickling models 
This prevents AppRegistryNotReady errors when unpickling Django
models from an external script.
Backport of 108b8bf85 from master.
 2014-12-17 18:41:12 +01:00
Mosson, Andrew 6d8c14621e [1.7x.] Fixed #23497 -- Made admin system checks run for custom AdminSites. 
Backport of b7219c7ba5 from master
 2014-12-17 09:16:05 -05:00
Tim Graham c085bea6c3 [1.7.x] Fixed #23975 -- Restored pre_migrate signal if all apps have migrations. 
Thanks kmmbvnr for the report.

Backport of d2ff8a7241 from master
 2014-12-16 18:39:19 -05:00
Andriy Sokolovskiy 10482faf19 [1.7.x] Fixed #23983 -- Fixed a crash in migrations when adding order_with_respect_to to non-empty table. 
Backport of 3dbbb8a89c from master
 2014-12-16 10:56:35 -05:00
Tim Graham 66c0529b3e [1.7.x] Fixed refs #23987 test on Oracle. 
Backport of ac5f2a4ef7 from master
 2014-12-15 18:20:41 -05:00
Andriy Sokolovskiy fdf4dc6cea [1.7.x] Fixed #23405 -- Fixed makemigrations prompt when adding Text/CharField. 
A default is no longer required.

Backport of d8f3b86a76 from master
 2014-12-15 14:58:01 -05:00
Andriy Sokolovskiy 1690b92b0d [1.7.x] Fixed #23987 -- Made SQLite SchemaEditor always use effective_default(). 
Backport of 089047331d from master
 2014-12-15 13:42:08 -05:00
Carl Meyer 0a8b911582 [1.7.x] Fixed #23455 -- Accept either bytes or text for related_name, convert to text. 
Backport of c72eb80d11 from master.
 2014-12-12 13:13:57 -07:00
Carl Meyer f8b4cf4022 [1.7.x] Revert "Fixed #23455 -- Forced related_name to be a unicode string during deconstruction." 
This reverts commit 45bd7b3bd9.

This is a backport of 8aaf51f94c from master.
 2014-12-12 13:09:04 -07:00
Tim Graham c64286c62b [1.7.x] Fixed #23857 -- Fixed admin crash with "save as new" and deleting inline. 
Thanks amarandon for the report.

Backport of c7a19f4203 from master
 2014-12-12 11:49:44 -05:00
Grzegorz Slusarek 4b96e862b4 [1.7.x] Fixed #23674 -- Fixed a crash when a MultiValueField has invalid data. 
Backport of 0dea81cd6d from master
 2014-12-12 08:50:38 -05:00
Markus Holtermann f446acf8bb [1.7.x] Fixed #23956 -- Fixed migration creation for multiple table inheritance 
Backport of 44927ba817 from master
 2014-12-11 13:28:57 -05:00
Claude Paroz 6ba960266a [1.7.x] Fixed #23954 -- Added special text/varchar PostgreSQL indexes in migrations 
Thanks adityagupta104 for the report and Tim Graham for the review.
Backport of 8d7a48027e from master.
 2014-12-04 21:39:32 +01:00
Tim Graham d57124433f [1.7.x] Fixed #23920 -- Fixed MySQL crash when adding blank=True to TextField. 
Thanks wkornewald for the report and Markus Holtermann for review.

Backport of 765fa36d57 from master
 2014-12-04 10:59:05 -05:00
Tim Graham 5219a02fda [1.7.x] Added a test to verify headers set by default middleware; refs #23939. 
Backport of 50c1d8f24b from master
 2014-12-03 14:17:05 -05:00
Gavin Wahl e9975ed3cd [1.7.x] Fixed #23950 -- Prevented calling deconstruct on classes in MigrationWriter. 
Backport of dee4d23f7e from master
 2014-12-03 08:32:59 -05:00
Kamil Braun ccc30ffe57 [1.7.x] Fixed #23934 -- Fixed regression in admin views obj parameter. 
Backport of 0623f4dea4 from master
 2014-12-02 08:43:59 -05:00
Claude Paroz 3a42d9730c [1.7.x] Fixed #23909 -- Prevented crash when collecting SQL for RunSQL 
Thanks James Rivett-Carnac for the report and Markus Holtermann
for the review.
Backport of e11c6fd21 from master.
 2014-12-02 09:02:54 +01:00
Tim Graham bc5bb3e1a0 [1.7.x] Fixed selenium test failure of JavascriptI18nTests. 
The failure was introduced in dd1ea70779.
The tests wouldn't start due to a "Dependency on unknown app" error.

Backport of b8cc5f3cd4 from master
 2014-12-01 17:04:44 -05:00