p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,133 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

5 Commits

Author SHA1 Message Date
Tim Graham c0102dc7ff [1.8.x] Fixed skipping of gis_tests when dependencies not installed. 
Backport of ba1665ed75 from master
 2015-03-28 09:39:49 -04:00
Moritz Sichert 44a05a8a91 [1.8.x] Fixed #24469 -- Refined escaping of Django's form elements in non-Django templates. 
Backport of 1f2abf784a from master
 2015-03-27 20:01:41 -04:00
Aymeric Augustin e3953de900 [1.8.x] Normalized usage of the tempfile module. 
Specifically stopped using the dir argument.

Backport of a8fe12417f from master
 2015-02-23 15:26:35 -05:00
Loic Bistuer 3a6c37fce4 [1.8.x] Fixed #24351, #24346 -- Changed the signature of allow_migrate(). 
The new signature enables better support for routing RunPython and
RunSQL operations, especially w.r.t. reusable and third-party apps.

This commit also takes advantage of the deprecation cycle for the old
signature to remove the backward incompatibility introduced in #22583;
RunPython and RunSQL won't call allow_migrate() when when the router
has the old signature.

Thanks Aymeric Augustin and Tim Graham for helping shape up the patch.

Refs 22583.

Conflicts:
	django/db/utils.py

Backport of bed504d70b from master
 2015-02-20 21:55:50 +07:00
Tim Graham 69c89aeccf [1.8.x] Moved contrib.gis tests out of contrib. 
Backport of ad0be620ae from master
 2015-02-11 12:05:29 -05:00