mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
18,239 Commits 30 Branches 460 Tags
00c2a721e20f6487571ed14b69aed620f474104c
Commit Graph

18239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aymeric Augustin
6b38e48ba1 [1.7.x] Fixed #21166 -- Reset errors_occurred flag after commit and rollback. 
Backport of 3033a71 from master.

Conflicts:
	django/db/backends/__init__.py
 2014-04-25 22:52:51 +02:00
Aymeric Augustin
788fce4c91 [1.7.x] Fixed a confusing heading in applications docs. 
Refs #22422.

Backport of 0315f01 from master
 2014-04-25 17:40:33 +02:00
Tim Graham
c050ce7de2 [1.7.x] Fixed #22504 -- Corrected domain terminology in security guide. 
Thanks chris at chrullrich.net.

Backport of f65eb15ac6 from master
 2014-04-25 10:29:18 -04:00
Víðir Valberg Guðmundsson
bde1bc6672 [1.7.x] Fixed #22422 -- Moved information about the application loading process to refs/applications.txt. 
Backport of deb561bbe2 from master
 2014-04-25 10:12:55 -04:00
Moayad Mardini
ae15356061 [1.7.x] Fixed #22493 - Added warnings to raw() and extra() docs about SQL injection 
Thanks Erik Romijn for the suggestion.

Backport of 3776926cfe from master
 2014-04-25 09:56:04 -04:00
Malcolm Box
658710be00 [1.7.x] Fixed #22516 -- Added versionchanged annotation for STATIC_ROOT default value. 2014-04-25 09:36:18 -04:00
Tim Graham
6d87acc390 [1.7.x] Fixed #22515 -- Fixed the object_id of the LogEntry that's created after a user password change in the admin. 
Thanks ross at servercode.co.uk for the report.

Backport of 9e7f86b890 from master
 2014-04-25 08:36:20 -04:00
Aymeric Augustin
782fa14db4 [1.7.x] Set some transaction-related feature flags on SQLite. 
Refs #22496.

Backport of e368912 from master.
 2014-04-25 11:45:58 +02:00
Shai Berger
b8b179bbf5 [1.7.x] Fixed #22498 -- constraint name was not quoted in FK creation SQL 
Backport of 843613add4 from master
 2014-04-25 01:35:59 +03:00
Shai Berger
7421e1e320 [1.7.x] Made sure cursor.close() does not complain if cursor is already closed on Oracle 
Refs #22483

Backport of 53d97e4fe3 from master
 2014-04-25 01:35:38 +03:00
Tim Graham
bee118a701 [1.7.x] Fixed #22499 -- Fixed a typo in an admin_views test that caused failure on Oracle. 
Backport of d238c58912 from master
 2014-04-24 07:06:57 -04:00
Claude Paroz
1a3cde5f9f [1.7.x] Renamed Transifex project from django-core to django 
See also http://blog.transifex.com/post/83622601443/new-teams-management-transifex
Backport of 7c24027ba from master.
 2014-04-24 11:51:53 +02:00
Aymeric Augustin
9bbb43dd1a [1.7.x] Ignored repeated calls to connection.close(). 
Backport of d4cc59ef from master
 2014-04-24 08:43:24 +02:00
Aymeric Augustin
5cd6429620 [1.7.x] Prevented a crash in the cursor wrappers on Oracle. 
Fixed #22483 (again).

Backport of 0f85103e from master
 2014-04-24 08:43:16 +02:00
Aymeric Augustin
e32e359d6a [1.7.x] Used the same instance of atomic for entry and exit. 
Since all state is maintained on the connection at this time and none in
the atomic, it doesn't matter, but it could introduce some subtle bugs
if the implementation changed in the future.

Backport of 0aa4c6c3 from master
 2014-04-23 21:45:49 +02:00
Aymeric Augustin
9bf890f6f9 [1.7.x] Wrapped migrations in a transaction only on DBs with transactional DDL. 
Backport of e74d2183 from master
 2014-04-23 21:45:38 +02:00
Claude Paroz
0424c84d54 [1.7.x] Set compile messages options as class variable 
Refs #18714. Same logic as options for makemessages commands.
Backport of 3a435a057 from master.
 2014-04-23 15:16:38 +02:00
Malcolm Box
07235aec9d [1.7.x] Fixed #22495 -- Locmem cache.add() failed with infinite timeouts 
cache.add() incorrectly succeeded when there was an existing key
with an infinite (None) timeout.
Backport of af5f688392 from master.
 2014-04-23 14:56:54 +02:00
Tim Graham
e192f13103 [1.7.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial. 
Regression in 8b93b31487.

Thanks rcoup for the report.

Backport of 3c06b2f2a3 from master
 2014-04-23 08:49:53 -04:00
Claude Paroz
c3228ef3e2 [1.7.x] Added Spatialite support to the new migration framework 
Refs #22451.
Backport of 2ffa6ca73a from master.
 2014-04-23 13:48:36 +02:00
Claude Paroz
423e2cf1ea [1.7.x] Used migration framework in GIS test tearDown 
Backport of 48c4ea414 from master.
 2014-04-23 13:47:49 +02:00
Marti Raudsepp
ba1728dd9b [1.7.x] Various documentation typo/spelling fixes 
Errors detected by Topy (https://github.com/intgr/topy), all changes
verified by hand.

Backport of 11d453bcad from master
 2014-04-22 20:10:58 -04:00
Ray Ashman
4499c676ef [1.7.x] Updated grammar in description of django.contrib.auth. 
Backport of 9853779805 from master
 2014-04-22 18:29:03 -04:00
Claude Paroz
1d0f1ee199 [1.7.x] Fixed table cleanup in GIS migration tests 
Backport of ab90c4707b from master.
 2014-04-22 19:52:58 +02:00
Claude Paroz
417e9f383f [1.7.x] Fixed removal of GIS column in PostGIS 1.x migration 
Refs #22481.
Backport of 2f9d1576e from master, squashed with 2f9d1576e8.
 2014-04-22 19:52:58 +02:00
Claude Paroz
5c19c698b1 [1.7.x] Fixed adding new GIS column in PostGIS 1.x migration 
Refs #22451.
Backport of fb09a489c from master.
 2014-04-22 19:52:58 +02:00
Preston Timmons
935159d951 [1.7.x] Fixed #22478 -- Regression in test label discovery. 
As part of the app-loading updates the old test runner was changed to not
require a models module. This introduced a regression in behavior so
applabel.TestCase failed for tests defined in a directory.

The fix is thanks to yakky and rtnpro.
 2014-04-22 12:48:39 -04:00
Tim Graham
55da4e818d [1.7.x] Added 1.6.4 release note stub. 
Backport of 9fb95dfc9f from master
 2014-04-22 11:47:52 -04:00
Florian Apolloner
97b5833e21 [1.7.x] Fixed #22426 -- Added support old-style d.c.messages format. 
Forward ported code from 1.5 that adds backwards compatibility with legacy message length.
See commit 9e7183073f for details.

Thanks to Ofir Ovadia for the initial patch.

Backport of f286721f7f from master.
 2014-04-22 10:47:26 +02:00
James Bennett
df81625da6 [1.7.x] Update for 1.7b2 security release. 1.7b2 2014-04-21 18:21:55 -05:00
Erik Romijn
5577fd673e [1.7.x] Added information on resolved security issues to release notes. 
Backport of c07f3e60c2 from master
 2014-04-21 18:29:42 -04:00
Erik Romijn
34526c2f56 [1.7.x] Fixed queries that may return unexpected results on MySQL due to typecasting. 
This is a security fix. Disclosure will follow shortly.

Backport of 75c0d4ea3a from master
 2014-04-21 18:29:39 -04:00
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