mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-14 19:30:46 +00:00
Code Issues 32 Releases Wiki Activity
18,118 Commits 29 Branches 437 Tags
Commit Graph

10992 Commits

Author SHA1 Message Date
areski
e22ad1c325 [1.7.x] Fixed #23112 -- Field.get_choices tries to index an iterable 
Backport of 97a38de230371c0b6ad8a86abba8425186c147c7 from master.
 2014-07-30 21:36:01 +02:00
areski
7cb4a82eaf [1.7.x] Fixed #23107 -- Made runserver output respect --no-color. 
Backport of 67d7da5fb9 from master
 2014-07-30 12:59:39 -04:00
Andrew Godwin
8e7fdfdb6f [1.7.x] Fixed #23092: Squashing handles external dependencies 2014-07-29 10:22:30 -07:00
Andrew Godwin
3deddc2fdf [1.7.x] Fixed #23090: Document and enforce not double-squashing migrations 2014-07-29 10:03:59 -07:00
Andrew Godwin
0a4fbf4e13 [1.7.x] Fixed #23101: Prefer doing deletes before creates in autodetector. 
Makes declined or missed renames still work (but drop data).
 2014-07-29 09:39:01 -07:00
Andrew Godwin
9abc36b626 [1.7.x] Fix soft_applied in a way that doesn't break tests 2014-07-29 09:24:22 -07:00
Andrew Godwin
053af1422a [1.7.x] Make detect_soft_applied exit correctly on non-create migrations 2014-07-29 09:19:48 -07:00
Andrew Godwin
394053ce60 [1.7.x] Fixed #23121: AlterModelOptions operation not changing state right 2014-07-28 10:47:55 -07:00
Andrew Godwin
d84b881600 [1.7.x] Fixed #23100: Individual FK creation missing dependencies 2014-07-28 10:33:28 -07:00
James Bennett
b4c80238a2 [1.7.x] Bump version number for 1.7 RC 2. 2014-07-27 14:33:04 +02:00
Florian Apolloner
99c2c917c3 [1.7.x] Fixed #23098 -- Checked that lazy choices are not evaluated too soon 
Thanks Matthieu Agopian for the report.

Backport of 2f73b527dda6683868fac2791f7f07ccb01ea0d9 from master.
 2014-07-27 13:32:07 +02:00
Florian Apolloner
f8ec200671 [1.7.x] Only warn about initial data if fixtures have been found. 
Backport of 2ab0ed7b2842fbb8bf36ee7df9949d10546d953d from master.
 2014-07-27 13:29:36 +02:00
Abraham Martin
999758fc7a Fixed #23101 db_table wasn't copied in deconstruct 2014-07-26 18:48:36 +02:00
Andrew Godwin
7e708a2536 [1.7.x] Fixed #22944: Bad dependency on FK alteration in autodetector 2014-07-26 09:22:31 -07:00
qingfeng
3a2badcbb7 [1.7.x] Fixed #23060 -- Prevented UnicodeDecodeError in debug templatetag 
Backport of 08451f17d0 from master.
 2014-07-26 18:04:01 +02:00
Hiroki KIYOHARA
df678b7500 [1.7.x] Fixed code to solve #23070 problem 
Added a class to wrap callable in settings:
* Not to call in the debug page (#21345).
* Not to break the debug page if the callable forbidding to set attributes (#23070).

Thanks @bmispelon for giving me some advice.

Backport of d0889863de50d65659f56f0b9ea0672a8b6482a1 from master.
 2014-07-26 14:53:31 +02:00
Federico Frenguelli
bc3d401b9f [1.7.x] Fixed #22887 -- Added comment for translators on unique_for_date error message 
Backport of 6eed751162 from master.
 2014-07-26 13:56:58 +02:00
Tim Graham
4f8a5bd8d0 [1.7.x] Fixed #23083 -- Fixed runserver reloading when deleting a file. 
Thanks Collin Anderson for the report and hirokiky for the fix.

Backport of b8cb5ba708 from master
 2014-07-25 13:25:16 -04:00
Andrew Godwin
3268711417 [1.7.x] Fixed #23085: Better error message for PostGIS 1.5/bad custom fields 2014-07-25 09:50:17 -07:00
Andrew Godwin
e01c565b47 [1.7.x] Restore support for reading __latest__ for compatability 2014-07-25 09:44:15 -07:00
Andrew Godwin
919d10e619 [1.7.x] Fixed #23093: soft application detection for swapped models 2014-07-25 09:35:53 -07:00
Andrew Godwin
2bacc9f3b7 [1.7.x] Mark initial_data as deprecated separately from syncdb. Refs #23077. 
Conflicts:
	docs/internals/deprecation.txt
 2014-07-25 09:11:01 -07:00
Jeroen Dekkers
6e7e5bacd5 [1.7.x] Fixed #23071 -- Use last migration's name in dependency to other app 
Changed the autodetector to lookup the name of the other app's last
migration in the graph and use that as dependency instead of using
__latest__.
 2014-07-25 08:54:54 -07:00
Moayad Mardini
ce95ab8f02 [1.7.x] Fixed #23088 -- Used six range type in Paginator.page_range. 
Backport of 6508db2ff9 from master
 2014-07-25 06:16:55 -04:00
Aymeric Augustin
0ac986fd8c [1.7.x] Avoided transactional truncates on amateur databases. 
Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308.

Backport of 6877a9d4 from master
 2014-07-24 19:18:06 -04:00
Aymeric Augustin
2a97db33a7 [1.7.x] Avoided transactional DDL on castrated databases. 
Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308 and #23089.

Backport of 0757e0f30d from master
 2014-07-24 18:48:05 -04:00
Aymeric Augustin
5ca82ff71b [1.7.x] Fixed #23089 -- Fixed transaction handling in two management commands. 
Previously, when createcachetable and flush operated on non-default
databases, they weren't atomic.

Backport of 753a22a635 from master
 2014-07-24 18:13:12 -04:00
Tim Graham
b918bc921c [1.7.x] Fixed #23014 -- Infinite migration regression with unique/index_together. 
Backport of 64e75c47ef from master
 2014-07-24 14:30:16 -04:00
Nick Sandford
9638daec5c [1.7.x] Fixed #23078 -- Regression in update_contenttypes() interactivity. 
Thanks raymond at adaptiv.nl for the report.

Backport of fa3cf006b2 from master
 2014-07-23 08:49:55 -04:00
Claude Paroz
ddb5674945 [1.7.x] Fixed #23030 -- Properly handled geometry columns metadata during migrations 
Thanks kunitoki for the report and initial patches.
Backport of 8c30df15f1 from master.
 2014-07-23 12:16:11 +02:00
Claude Paroz
86655111c9 [1.7.x] Adapted SpatialiteGeometryColumns model to spatialite >= 4 
See also:
https://www.gaia-gis.it/fossil/libspatialite/wiki?name=switching-to-4.0
Backport of 19d8f2ebf4 from master.
 2014-07-23 12:15:44 +02:00
Iain Dawson
59fec1ca9b [1.7.x] Replaced instances of 'his/her' with 'their'. 
Backport of 8fbf13a6c8 from master
 2014-07-21 19:54:22 +00:00
Claude Paroz
6e41ae1a4e [1.7.x] Fixed #23064 -- Added lib detection support for GDAL 1.10/1.11 
Note that GDAL 1.11 is not yet officially supported, until someone
has tested it and can confirm it has no issues with Django.
Backport of 3f1412ff7b from master.
 2014-07-21 19:07:48 +02:00
Andrew Godwin
e2220c1c08 [1.7.x] Fixed #23014: Renaming not atomic with unique together 2014-07-21 11:37:10 +01:00
Andrew Godwin
88135a8cf7 [1.7.x] Fixed #23009: Shorten FK identifiers in add_field and make consistent 2014-07-21 10:50:58 +01:00
Andrew Godwin
f57e84392e [1.7.x] Fixed #22975: Don't call rename SQL if not needed 2014-07-21 10:14:34 +01:00
Andrew Godwin
ff8d715a0a [1.7.x] Fixed #23039: Don't try to serialize unmanaged models in tests 2014-07-21 10:09:58 +01:00
Andrew Godwin
2fb1939a9e [1.7.x] Fixed #23043: alter_field drops defaults too 2014-07-21 10:04:53 +01:00
Andrew Godwin
de709001c4 [1.7.x] Fixed #23041: Bad base dependencies for proxy models 2014-07-16 09:59:37 -07:00
Gavin Wahl
72419ca8da [1.7.x] Fixed #22998 -- Updated the fast_delete logic for GFKs 
Backport of 6e2b82fdf6 from master
 2014-07-16 12:43:14 +03:00
Claude Paroz
d6f293ad1b [1.7.x] Ignored STATIC_ROOT and MEDIA_ROOT in makemessages 
Also alleviate issues with weird file names typically found in
MEDIA_ROOT directories (#23010).
Thanks Tim Graham for the review.
Backport of 28efafa24c from master.
 2014-07-16 09:43:50 +02:00
Tim Graham
01515ebaa4 [1.7.x] Fixed #23013 -- Fixed removing unique_together/index_together constraints in migrations. 
Thanks melinath for the report.

Backport of 0154965392 from master
 2014-07-15 15:21:44 -04:00
Tim Graham
fe5f29eb1d [1.7.x] Fixed #23008 -- Fixed typo causing bad migration dependencies. 
Thanks semenov for the report and Florian for investigation.

Backport of 9a2ab62977 from master
 2014-07-15 08:51:16 -04:00
Claude Paroz
f2011e21a2 [1.7.x] Fixed #22991 -- Prevented *.pyc files in autoreload monitoring 
This fixes a regression introduced in 6d302f639.
Thanks lorinkoz at gmail.com for the report, Collin Anderson
for the initial patch and Simon Charette for the review.
Backport of 4e424084e from master.
 2014-07-15 09:59:25 +02:00
Huu Nguyen
6d5238f6c8 [1.7.x] Fixed #22791 -- Invoke interactive questioner only for conflicts in specified apps. 
Thanks bendavis78 for the report and Tim Graham for the review.

Backport of f7a78f9bba from master
 2014-07-14 13:00:45 -04:00
Anssi Kääriäinen
572885729e [1.7.x] Fixed #22994 -- regression with generic FK + admin list_view 
The reason for the regression was that the GenericForeignKey field isn't
something meta.get_field_by_name() should return. The reason is that a
couple of places in Django expects get_field_by_name() to work this way.
It could make sense to return GFKs from get_field_by_name(), but that
should likely be done as part of meta refactoring or virtual fields
refactoring patches.

Thanks to glicerinu@gmail.com for the report and to Tim for working on
the issue.
 2014-07-14 12:51:24 -04:00
Alex Gaynor
1d1debeed4 [1.7.x] Added a newline to appease flake8 
Backport of 037f81fedc from master
 2014-07-14 10:54:43 -04:00
Claude Paroz
be38c5bcc8 [1.7.x] Fixed #22939 -- Delayed admin_static backend detection 
Thanks generalov for the report.

Backport of 22b2fb0b from master
 2014-07-12 18:50:32 +02:00
Aymeric Augustin
dda6759e0e [1.7.x] Checked more precisely whether the app registry is ready. 
Accounted for the three stages of population: app configs, models,
ready() methods of app configs.

Backport of a764a9cc from master
 2014-07-12 18:50:23 +02:00
Tim Graham
aa1c615428 [1.7.x] Removed extra newline. 
Backport of b48c2c5925 from master
 2014-07-12 10:17:20 -04:00