mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-08 15:36:47 +00:00
Code Issues 32 Releases Wiki Activity
25,898 Commits 29 Branches 441 Tags
Commit Graph

9575 Commits

Author SHA1 Message Date
Jon Dufresne
f53ed7846b [2.1.x] Refs #29784 -- Normalized Python docs links to omit the version. 
Backport of ad9a28ee38e3352b16cc6c9ae7f55f90c64710cc from master.
 2018-09-25 10:22:06 +02:00
Simon Charette
4c5a8c6f50 [2.1.x] Fixed #29755 -- Made migrations detect changes to Meta.default_related_name. 
Backport of a4495f4b989dc919d80fcf9f38e31e247faa94fb from master
 2018-09-14 10:20:27 -04:00
Tim Graham
5bbcf83fce [2.1.x] Fixed #29749 -- Made the migrations loader ignore files starting with a tilde or underscore. 
Regression in 29150d5da880ac1db15e47052330790cf1b802d2.
Backport of 32fbccab406b680bc0a0a8d39a9b95c3a08bbc5a from master
 2018-09-11 12:51:24 -04:00
Alexander Holmbäck
bd5ce0599b [2.1.x] Fixed #29727 -- Made nonexistent joins in F() raise FieldError. 
Regression in 2162f0983de0dfe2178531638ce7ea56f54dd4e7.

Backport of f315d0423a09dfe20dd4d4f6a0eb11fc8e45a665 from master
 2018-09-08 09:50:02 -04:00
Alexander Holmbäck
ed60ce55c2 [2.1.x] Moved test for nonexistent field in F() to BasicExpressionsTest. 
Backport of aa16ec54747eaa9da7534e67a1de320b9a517c1c from master
 2018-09-08 09:40:53 -04:00
James Aylett
231c595bde [2.1.x] Refs #16470 -- Fixed typo in a FileResponse test. 
Backport of ee52044a278885bd9455dd59b1e16c5d5e2d68ce from master.
 2018-09-01 15:16:07 +02:00
Tim Graham
152b1d783b [2.1.x] Fixed #29723 -- Fixed crash if InlineModelAdmin.has_add_permission() doesn't accept the obj argument. 
* Refs #27991 -- Added testing for ModelAdmin.get_inline_instances() if the inline's has_add_permission() doesn't accept 'obj'.

* Fixed #29723 -- Fixed crash if InlineModelAdmin.has_add_permission() doesn't accept the obj argument.

Backport of fd8a7a5313f5e223212085b2e470e43c0047e066 from master
 2018-08-30 11:36:04 +02:00
Mariusz Felisiak
e7acd99113 [2.1.x] Fixed #29694 -- Fixed column mismatch crash with QuerySet.values() or values_list() after combining querysets with extra() with union(), difference(), or intersection(). 
Regression in 0b66c3b442875627fa6daef4ac1e90900d74290b.
Backport of 39461a83c33f0cfe719d3b139413d1f5d1e75d5e from master
 2018-08-29 10:03:36 +02:00
Tim Graham
53b9a6654b [2.1.x] Fixed #29682 -- Fixed admin change form crash if a view-only model's form has an extra field. 
Backport of d311124be59df64278f3149d68e79ce45b8a6c64 from master
 2018-08-20 11:15:16 -04:00
Jon Dufresne
cae84904c6 [2.1.x] Refs #29015 -- Added database name to PostgreSQL database name too long exception. 
Backport of bf17f5e88466e3f571065345f5b2fea0d8af89fe from master
 2018-08-17 12:44:17 -04:00
Jon Dufresne
9c93bf0903 [2.1.x] Fixed #29663 -- Made admin change view redirect to changelist with view permission. 
Backport of 09ee3b6fe3c4d80bb445835f88148d6f48cde3ff from master
 2018-08-17 11:21:17 -04:00
Marnanel Thurman
ef306338eb [2.1.x] Fixed #29662 -- Allowed test client to accept structured suffix JSON content types. 
Backport of 7cc52250f06c2a4769badbab1d7ee01f8e3cb46a from master
 2018-08-15 10:28:08 -04:00
Ramiro Morales
f72a7d8f44 [2.1.x] Fixed #29653 -- Fixed missing related_query_name reverse accessor if GenericRelation is declared on an abstract base model. 
Regression in 4ab027b94409e6415b774797bf9d3593da9d9ea8.

Thanks Lauri Kainulainen for the report.

Backport of b5c7cb4d3306a7b4e8f87bcf365ff30ae53018ed from master
 2018-08-10 12:43:27 -04:00
Clément Mangin
d7615674d9 [2.1.x] Fixed #29637 -- Fixed admin change form crash if the user doesn’t have the add permission to a TabularInline. 
Regression in 825f0beda804e48e9197fcf3b0d909f9f548aa47.

Backport of 64e1a271f50d921a54388539b6ff7102a31c3d29 from master
 2018-08-10 11:32:52 -04:00
Tim Graham
e3be4e94d1 [2.1.x] Fixed #29623 -- Fixed translation failure of DurationField's "overflow" error message. 
Backport of 730173d1c5cf210d8e3bd951fa49f64b9bc561ca from master
 2018-08-08 06:38:27 -04:00
Mariusz Felisiak
2bf766cedc
[2.1.x] Fixed #29643 -- Fixed crash when combining Q objects with __in lookups and lists. 
Regression in fc6528b25ab1834be1a478b405bf8f7ec5cf860c.
Backport of 9fee229874367beafd532dad6d0f9ff9676ded0b from master
 2018-08-08 08:52:55 +02:00
Mariusz Felisiak
c706091225
[2.1.x] Fixed #29613 -- Fixed --keepdb on PostgreSQL if the database exists and the user can't create databases. 
Regression in e776dd2db677d58dcb50aea20d3bb191537df25b.

Thanks Tim Graham for the review.
Backport of 1a9cbf41a130def83a7e384955544d08be0fc148 from master
 2018-08-03 10:33:52 +02:00
Tim Graham
0cfca0f2cc [2.1.x] Fixed #29627 -- Fixed QueryDict.urlencode() crash with non-string values. 
Regression in 7d96f0c49ab750799860e42716d7105e11de44de.
Backport of d8e2be459f97f1773c7edf7d37de180139146176 from master
 2018-08-02 21:56:43 -04:00
Michael Sanders
221ef69a9b [2.1.x] Fixed #29499 -- Fixed race condition in QuerySet.update_or_create(). 
A race condition happened when the object didn't already exist and
another process/thread created the object before update_or_create()
did and then attempted to update the object, also before update_or_create()
saved the object. The update by the other process/thread could be lost.

Backport of 271542dad1686c438f658aa6220982495db09797 from master
 2018-08-02 17:17:12 -04:00
luz.paz
adfd261404 [2.1.x] Fixed typos in comments and docs. 
Backport of 97e637a87fb45c4de970cca6cb783d93473c9d15 from master
 2018-08-01 16:13:18 -04:00
Andreas Hug
c4e5ff7fdb [2.1.x] Fixed CVE-2018-14574 -- Fixed open redirect possibility in CommonMiddleware. 2018-08-01 09:35:09 -04:00
Dražen Odobašić
4dadf4eb7b [2.1.x] Fixed #29617 -- Fixed Template crash if template_string is lazy. 
Regression in 3a148f958dddd97c1379081118c30fbede6b6bc4.
Backport of 9f3b9ffd51c71d96728df9ee16f5a57c6f3b315d from master
 2018-07-31 09:57:28 -04:00
Carlton Gibson
278457988a [2.1.x] Refs #29514 -- Added test for get_default_timezone()/timezone.utc equality. 
Backport of f4ef71c689b7bf3b0237d12c634fe5557f646a79 from master
 2018-07-23 10:44:25 -04:00
Claude Paroz
1084bcc4b7 [2.1.x] Fixed #29578 -- Made numberformat.format() honor forced l10n usage. 
Thanks Sassan Haradji for the report.
Backport of 0adfba968e28cfb4e4d681e658866debbbd68089 from master
 2018-07-19 16:44:57 -04:00
Tom
c7ac2ee773 [2.1.x] Refs #29451 -- Fixed test_isvalid_lookup on MySQL 8+. 
Backport of f98e1c01eafa724cb87772ae03b3fd1158e9fd50 from master
 2018-07-06 09:05:55 -04:00
Tim Graham
78f502cd0b [2.1.x] Fixed #29449 -- Reverted "Fixed #28757 -- Allowed using contrib.auth forms without installing contrib.auth." 
This reverts commit 3333d935d2914cd80cf31f4803821ad5c0e2a51d due to
a crash if USERNAME_FIELD isn't a CharField.

Backport of f3fa86a89b3b85242f49b2b9acf58b5ea35acc1f from master
 2018-07-02 18:57:12 -04:00
Tim Graham
01b7fdfd67 [2.1.x] Fixed #29520 -- Fixed test client crash when posting bytes. 
Regression in b8a41a2872624a6d9e61308932dd81d001e31eb9.

Backport of 9294110a57ce0a6d14506969c950090045c622c8 from master
 2018-06-27 16:52:06 -04:00
Chris Jerdonek
da46599143 [2.1.x] Refs #29253 -- Fixed method_decorator() crash if decorator sets a new attribute. 
Regression in fdc936c9130cf4fb5d59869674b9a31cc79a7999.

Backport of f434f5b84f7fcea9a76a551621ecce70786e2899 from master
 2018-06-27 11:46:24 -04:00
Tim Graham
714612a638 [2.1.x] Fixed #29511 -- Added charset to JavaScriptCatalog's Content-Type header. 
Backport of 7cdeb23ae7ef2d125276840ff298dbb9683959f2 from master
 2018-06-22 09:32:33 +02:00
Carlton Gibson
dae75481fa [2.1.x] Refs #29451 -- Fixed invalid SQL on MySQL in queries tests. 
Backport of c4f099de1d0d82c5e1f88768300896eae69bddbd from master
 2018-06-20 10:39:15 -04:00
Nick Pope
16e691d568 [2.1.x] Fixed #29503 -- Made __in lookup keep order of values in query. 
Regression in 86eccdc8b67728d84440a46e5bf62c78f2eddf6d.

Backport of b0fbfae09334554124e1dccb7559d10f36e2f84c from master
 2018-06-20 09:42:47 -04:00
Carlton Gibson
67fc680c43 [2.1.x] Fixed #29502 -- Allowed users with the view permission to use autocomplete_fields. 
Backport of 5b733171813f8ddc7af84abe79f2646204b9c6ca from master
 2018-06-18 15:37:10 -04:00
Carlton Gibson
306f1f8ea3 [2.1.x] Fixed #29419 -- Allowed permissioning of admin actions. 
Backport of 958c7b301ead79974db8edd5b9c6588a10a28ae7 from master
 2018-06-18 15:37:05 -04:00
Mariusz Felisiak
d2ca28db54
[2.1.x] Fixed #29496 -- Fixed crash on Oracle when converting a non-unique field to primary key. 
Thanks Tim Graham for the review.
Backport of 6dd4edb1b4f5441c5f543e29395039839c50d10b from master
 2018-06-17 08:54:01 +02:00
oliver
d03b130cbc [2.1.x] Fixed #29469 -- Added a helpful makemigrations error if app_label contains dots. 
Backport of 78972af367a1da54aa7e539e4b1ffa2b56571e77 from master
 2018-06-16 15:19:08 -04:00
Paulo
8cbfaf29c0 [2.1.x] Fixed #29487 -- Accounted for object level permissions when calculating change view's read-only fields. 
Thanks Matthew Frazier for the report and fix.

Backport of 553617e61324dd5d9b34c47ceb2b6f20888daf20 from master
 2018-06-15 22:11:32 -04:00
Tim Graham
7f173b6b4f [2.1.x] Fixed #29498 -- Fixed a missing pyc test file in source distribution. 
Backport of 63f90f55f30d599d601d729060cdb0ebd2abdeb8 from master
 2018-06-15 14:49:18 -04:00
Jeff
2b7b199390 [2.1.x] Fixed #29000 -- Fixed RenameModel's renaming of a M2M column when run after RenameField. 
Regression in 45ded053b1f4320284aa5dac63052f6d1baefea9.

Backport of fcc4e251dbc917118f73d7187ee2f4cbf3883f36 from master
 2018-06-15 12:07:40 -04:00
Henk Kahlfuß
0eca99dade [2.1.x] Fixed #23869 -- Made ModelAdmin.get_deleted_objects() use has_delete_permission() for permissions checking. 
Backport of 3eb9127678e292ef2645b632199f3e9c876ad999 from master
 2018-06-15 10:47:05 -04:00
Tim Graham
531a152c65 [2.1.x] Refs #29428 -- Fixed admin check crash when using a query expression in ModelAdmin.ordering. 
Backport of ec2c9c353113bb1db6e32ed3f0b6c28bc06ca2eb from master
 2018-06-15 10:00:38 -04:00
Tim Graham
a041161bde [2.1.x] Fixed #29428 -- Fixed admin changelist crash when using a query expression without asc()/desc() in the ordering. 
Backport of 0d8e3e608ee9aab5076d497664aa97e0a29e523e from master
 2018-06-15 10:00:29 -04:00
Carlton Gibson
aea0e2b9ca [2.1.x] Refs #29419, #8936 -- Removed change permission requirement for admin actions. 
Partially reverted 825f0beda804e48e9197fcf3b0d909f9f548aa47.

Backport of b30f9b131c9489b9d9f21c311ecb46d0aea91381 from master
 2018-06-13 14:53:25 -04:00
Bartosz Grabski
c7d59825d7 [2.1.x] Fixed #29452 -- Fixed makemessages setting charset of .pot files. 
Backport of 2bc014750adb093131f77e4c20bc17ba64b75cac from master
 2018-06-12 08:29:22 -04:00
Arthur Silva
91a02dce97 [2.1.x] Fixed #29464 -- Silenced post-process messages in collectstatic's default verbosity. 
Backport of bc1435551c0cfaf4a22aff8216990b909005dba9 from master
 2018-06-11 20:49:27 -04:00
Claude Paroz
69e2d173e5 [2.1.x] Refs #29483 -- Relaxed WGS 84 check regex 
With GDAL 2.3, the exact string changed again.
Backport of 86988dd890671aa8935f86eab2bbe22ad917db70 from master.
 2018-06-09 09:20:52 +02:00
Claude Paroz
33b5313d7c [2.1.x] Fixed #29301 -- Added custom help formatter to BaseCommand class 
This partially reverts c3055242c81812278ebdc93dd109f30d2cbd1610.
Thanks Adam Johnson and Carlton Gibson for the reviews.
Backport of ce3351b9508896afdf87d11bd64fd6b5ad928228 from master.
 2018-06-06 19:17:57 +02:00
Tim Graham
60aa235f43 [2.1.x] Fixed MySQL QuerySet.explain() test when running tests in reverse. 
Backport of 13fe5a87f9554a6371f1d0914887bffcdf978a8a from master
 2018-06-06 11:31:39 -04:00
Tim Graham
ae3ddce4e8 [2.1.x] Relaxed a GDAL raster test. 
The exact metadata depends on the GDAL version.

Backport of 3dffcb5579a5a64f1869b9b46a379d519079d805 from master
 2018-06-04 10:02:18 -04:00
Tim Graham
cc8ef63211 [2.1.x] Fixed #29461 -- Fixed ogrinspect test_time_field failure on SpatiaLite. 
Backport of 666be7b9942611d5c0f5e485c448f219cd5a1ad5 from master
 2018-06-02 07:33:09 -04:00
Tim Graham
93304b2269 [2.1.x] Fixed #29462 -- Fixed ogrinspect test failures with GDAL 2.2. 
Backport of 55f4eee75d41499995bfdb611ac89e80c87404eb from master
 2018-06-01 22:32:06 -04:00