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

17940 Commits

Author SHA1 Message Date
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
Dean Silfen 63ae8de8fc [1.7.x] Edited setup.py in reuseable apps tutorial to use a context manager for open(). 
Backport of b8d255071e from master
 2014-07-16 14:26:04 -04:00
Corey Farwell 71ff5708b4 [1.7.x] Alphabetized django.utils sections. 
Backport of e7827b9494 from master
 2014-07-16 13:55:38 -04:00
Tim Graham a8c4e0e93b [1.7.x] Added 1.6.6 release notes for #22998 (also forwardported those for #13794). 
Backport of c62c480b2b from master
 2014-07-16 13:35:41 -04:00
Bartek Ciszkowski 30a4cad2bf [1.7.x] Fixed reference to pk in RedirectView.get_redirect_url doc. 
Backport of d9f78d5344 from master
 2014-07-16 13:23:48 -04:00
Andrew Godwin de709001c4 [1.7.x] Fixed #23041: Bad base dependencies for proxy models 2014-07-16 09:59:37 -07:00
Tim Graham 8e34bcdfba [1.7.x] Fixed #23023 -- Added warning against local-memory cache. 
Thanks django at kerz.id.au.

Backport of 7d0519c725 from master
 2014-07-16 12:35:01 -04:00
Tim Graham 3552afa25e [1.7.x] Added Chrome/IE support for a selenium test. 
Backport of 5954aa6db0 from master
 2014-07-16 10:54:38 -04:00
Claude Paroz 15feb1d8e8 [1.7.x] Added forgotten files from commit 28efafa24c 
Backport of c5d8e4a0d1 from master.
 2014-07-16 14:30:43 +02:00
Anssi Kääriäinen f8a2a5604b [1.7.x] PEP8 cleanup 
Backport of f8df55050c from master
 2014-07-16 12:50:01 +03: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 4b53bfff37 [1.7.x] Fixed #22992 -- regression in .filter(generic_fk=...) error message 
Generic Foreign Keys can't be used as lhs in lookups for historical
reasons. Django 1.6 gave a FieldDoesNotExist exception when using GFKs
as lhs in lookups, but due to regression caused by lookup refactor patch
(20bab2cf9d) the exception type was
changed to AttributeError.

It might be a good idea to add support for gfk__exact and gfk__in lookups
later on.

Thanks to glicerinu@gmail.com for the report. The code in this commit
was written by Tim Graham.

Backport of efe87d3e48 from master
 2014-07-14 12:55:05 -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
Tim Graham dcb1b971c2 [1.7.x] Fixed #23015 -- Fixed major/minor release terminology in docs. 
Backport of dd6ef3197a from master
 2014-07-14 06:18:42 -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
Andrew Godwin 563046a7de [1.7.x] Fixed #22983: Alert when squashing RunPython operations with referred functions. 2014-07-11 19:01:47 -07:00
Tim Graham 736e289445 [1.7.x] Fixed #13794 -- Fixed to_field usage in BaseInlineFormSet. 
Thanks sebastien at clarisys.fr for the report and gautier
for the patch.

Backport of 5e2c4a4bd1 from master
 2014-07-10 17:36:04 -04:00
Andrew Godwin 3e13c1d9b1 [1.7.x] Add south upgrade note to 1.7 release notes 2014-07-10 10:01:12 -07:00
Andrew Godwin eb7e232e7f [1.7.x] Fix comment 2014-07-10 10:01:12 -07:00
Tim Graham dc7ac339a6 [1.7.x] Fixed typo in docs/ref/contrib/gis/geos.txt. 
Backport of fef26e9a87 from master
 2014-07-10 06:09:42 -04:00
Jorge C. Leitão bddea532f7 [1.7.x] Fixed #22809 -- Added model Field API reference. 
Thanks to @timgraham for the review.

Backport of e1fa7dffdc from master
 2014-07-10 06:05:05 -04:00
Andrew Godwin 23ff98888e [1.7.x] Fixed #22922: Better error message for InvalidBasesError. 2014-07-09 23:58:22 -07:00
Andrew Godwin aba75e73db [1.7.x] Fixed #22970: Incorrect dependencies for existing migrated apps 2014-07-09 23:53:53 -07:00
Tim Graham a3d710a38f [1.7.x] Revert "Improve cookie based session backend docs." refs #20418 
This reverts commit d9c01da1f8.

This is poor advice as it breaks the test client login (refs #22934).
We can add a note like this back after refs #22986 is resolved.

Backport of 3a85aae2ea from master
 2014-07-09 14:12:32 -04:00
Tim Graham 9673013abe [1.7.x] Fixed #22351 -- Removed usage of lambdas in model field options. 
Thanks claudep for review.

Backport of 5ebf03b7dd from master
 2014-07-09 07:32:44 -04:00
Jorge C. Leitão e548328851 [1.7.x] Fixed #22812 -- Refactored lookup API documentation. 
Thanks Anssi and Tim for reviews.

Backport of 8780849da0 from master
 2014-07-08 20:13:24 -04:00
Andrew Godwin 4368457a27 [1.7.x] Document -l as well as --list on migrate 2014-07-08 10:30:37 -07:00
Daniel Pyrathon 2100bcef41 [1.7.x] Added a unit test to ensure models cannot be ordered by a M2M field. 
Backport of 865bc71783 from master
 2014-07-08 09:20:15 -04:00
Tim Graham 9918b76447 [1.7.x] Fixed #22978 -- Removed a USA-centric example that didn't add much. 
Backport of 9f18b6bcb0 from master
 2014-07-08 08:57:41 -04:00
Tim Graham 1318254669 [1.7.x] Renamed an admin_views test to fix ordering issue. 
test_i18n_language_non_english_fallback fails if run after
test_L10N_deactivated; the tests can be run in any order after
a5f6cbce07 but this commit is not
in stable/1.7.x.
 2014-07-07 19:56:22 -04:00
Tim Graham 1326cd28d0 [1.7.x] Removed unnecessary directory in dispatch tests. 
Backport of 136a3ffe21 from master
 2014-07-07 19:22:20 -04:00
Tim Graham 0100afb013 [1.7.x] Fixed flake8 errors. 
Backport of fddd95254e from master
 2014-07-07 19:13:00 -04:00
Tim Graham 28962c57f3 [1.7.x] Fixed #22909 -- Removed camelCasing in some tests. 
Thanks brylie.

Backport of 89b9e6e5d6 from master
 2014-07-07 19:10:48 -04:00
Tim Graham c379fc4eec [1.7.x] Fixed #22942 -- Noted that __init__.py files are required for management command detection. 
Thanks Diego Cerdán for the suggestion.

Backport of 54546cee88 from master
 2014-07-07 18:09:15 -04:00
Collin Anderson 5acb0a9139 [1.7.x] Fixed a few PEP8 errors in settings doc. 
Backport of 2c1384fbac from master
 2014-07-07 15:33:03 -04:00
Tim Graham cf9e33f930 [1.7.x] Fixed #22966 -- Clarified which release notes appear for each doc version. 
Thanks haimunt at yahoo.com for the suggestion.

Backport of e6b3d6c22f from master
 2014-07-07 15:32:39 -04:00