mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-20 22:30:45 +00:00
Code Issues 32 Releases Wiki Activity
23,930 Commits 29 Branches 438 Tags
Commit Graph

8540 Commits

Author SHA1 Message Date
kapil garg
76b51656e6 [1.11.x] Fixed #27974 -- Kept resolved templates constant during one rendering cycle. 
Thanks Florian Apolloner for the initial patch.

Backport of 002fe076225c2aa6e389481b038f55acb6f807d0 from master
 2017-04-03 22:32:41 -04:00
Tim Graham
e34cce79ff [1.11.x] Refs #27025 -- Fixed "invalid escape sequence" warning in auth_tests on Python 3.6. 
Backport of d4d79d0f200357b28419203557cc61c8168316ab from master
 2017-04-02 20:03:36 -04:00
Claude Paroz
06d32f689e [1.11.x] Fixed #27866 -- Made ChoiceWidget.format_value() return a list 
Thanks Tim Graham for the review.
Backport of e487ffd3f0f9931e7c18bfbd47cf1e6b059ddc41 from master.
 2017-04-01 12:26:49 +02:00
heathervm
ff0c6b83e5 [1.11.x] Fixed #27993 -- Fixed model form default fallback for SelectMultiple. 
Backport of 7d1e23775344cc3dead03bd4af45f4fdf134b819 from master
 2017-03-31 10:10:30 -04:00
Sergey Fedoseev
8484cf4cd0 [1.11.x] Refs #18247 -- Fixed SQLite QuerySet filtering on decimal result of Least and Greatest. 
Backport of 068d75688f28f9a1530b771ae1d625f41e98cd82 from master
 2017-03-30 08:47:16 -04:00
Tim Graham
8cc2f5aed1 [1.11.x] Fixed #27956 -- Fixed display of errors in an {% extends %} child. 
Thanks Ling-Xiao Yang for the report and test, and
Preston Timmons for the fix.

Backport of e643ba8bcf0b1da517cbab689ac157ee031202a3 from master
 2017-03-25 08:22:31 -04:00
Sergey Fedoseev
b6a6787fd8 [1.11.x] Fixed #27603 -- Fixed AsKML when queryset is evaluated more than once. 
Backport of e9149d3eb0ed0ddc8b27b1990eb2b7293c1231cd from master
 2017-03-23 19:31:23 -04:00
Kapil Garg
a8c540accc [1.11.x] Fixed #27969 -- Fixed models.Field.formfield() setting 'disabled' for fields with choices. 
Backport of 7e09fa7f519daf2f9c26587c3da5dc044d84b032 from master
 2017-03-23 13:56:45 -04:00
James Beith
6963564ecc [1.11.x] Fixed #27975 -- Fixed crash if ModelChoiceField's queryset=None. 
Regression in 9153d8fbd6385db9f48793662de789fc3d686841.

Backport of 216bb2e8fbc3cb37615bbd70edaa73287acdca81 from master
 2017-03-22 08:57:02 -04:00
Mariusz Felisiak
b06855facd [1.11.x] Fixed #27966 -- Bumped required psycopg2 version to 2.5.4. 
Thanks Tim Graham for the review.

Backport of 43380e911073beab401a2fdeca0f25001e170dac from master
 2017-03-21 17:40:04 +01:00
Tim Graham
e5880516f9 [1.11.x] Fixed #27915 -- Allowed Meta.indexes to be defined in abstract models. 
Thanks Markus Holtermann for review.

Backport of 3d19d1428a05b514afb771b52870d1f7c25670d1 from master
 2017-03-21 11:32:43 -04:00
Sergey Fedoseev
4f02adbf53 [1.11.x] Fixed #27965 -- Fixed precision comparison in a geoforms test (refs #27939). 
Backport of 816c5753ac554b2af710aebc98ad60fd5823e03f from master
 2017-03-21 09:05:00 -04:00
Tim Graham
e0ddfa3af3 [1.11.x] Fixed #27890 -- Fixed FileNotFoundError cleanup exception in runtests.py on Python 3.6+. 
Backport of 0c6c859d4edf6e462d000da21b4fa5009cb2696f from master
 2017-03-20 12:02:09 -04:00
Mads Jensen
0b93a992e5 [1.11.x] Fixed #27935 -- Fixed crash with BrinIndex name > 30 characters. 
Backport of 82bb4e684f9d0e5939cb0596c249954df0888e2d from master
 2017-03-18 08:48:17 -04:00
Tim Graham
c548dba428 [1.11.x] Fixed #27939 -- Updated OpenLayersWidget.map_srid for OpenLayers 3. 
Regression in 2ebfda38e65177dfc7d6e90457ffa4a0fa2796f0 (refs #25004).

Backport of 93eca976c15dceaf445ab4739bb2f635a2021db0 from master
 2017-03-17 12:59:10 -04:00
Mariusz Felisiak
17d75472f0 [1.11.x] Fixed nondeterministic ordering test failure in model_forms. 
Backport of 2767ef3ca7 from master
 2017-03-17 09:44:45 +02:00
Tim Graham
4b57fa3746 [1.11.x] Updated postgis.net and gaia-gis.it links to https. 
Backport of 5bd7ffc3137745ef67a9393f62a74e862beaeff7 from master
 2017-03-16 14:03:52 -04:00
Josh Schneier
0cc9175c76 [1.11.x] Fixed #27897 -- Fixed crash with 'pk' in ModelAdmin.search_filters. 
Backport of 6bc4ff36db0d85ac96ca91ae758159ee43836f86 from master
 2017-03-15 13:45:36 -04:00
Tim Graham
a95616944b [1.11.x] Refs #27563 -- Fixed ModelChoiceField.__deepcopy__() so forms don't share a queryset cache. 
Thanks Luke Benstead for the report Simon Charettes for the fix.

Backport of 44f9241c48e28823b140bc4ec7515f5a88b88c32 from master
 2017-03-15 12:55:05 -04:00
Claude Paroz
70c5b8db42 [1.11.x] Refs #27920 -- Added missing encoding preamble on widget test file 2017-03-14 20:18:51 +01:00
Claude Paroz
d8e90040e9 [1.11.x] Fixed #27920 -- Restored empty RadioSelect choice producing value="" 
Regression in b52c73008a9d67e9ddbb841872dc15cdd3d6ee01.
Thanks Tim Graham for the review.
Backport of 540ae68a5cc6339c72375fad9b04dc48f3af4c93 from master.
 2017-03-14 18:27:19 +01:00
Tim Graham
e9ba8563c1 [1.11.x] Reverted "Refs #16682 -- Tested transaction.atomic() with KeyboardInterrupt." 
This reverts commit d895fc9ac01db3d3420aa7c943949fe17b3ce028 since the
test is problematic as described in the ticket.

Backport of dfbdba924fd7cf12ce92f7a86b97590d25b75733 from master
 2017-03-09 10:09:00 -05:00
Camilo Nova
33d2c53fb1 [1.11.x] Fixed #27891 -- Added PasswordResetConfirmView.post_reset_login_backend. 
Backport of 5db465d5a6c389b8f9c6e21f7233be9387dc069d from master
 2017-03-07 19:54:23 -05:00
Tim Graham
36d640cd1f [1.11.x] Factored out uid/user tokens in auth_tests urlpatterns. 
Backport of 72ff9d53e66d6b59ae5d8a1b830f5fc798eb75d0 from master
 2017-03-07 19:53:08 -05:00
Raphael Merx
89b31b312e [1.11.x] Fixed #27905 – Added RelatedFieldWidgetWrapper.value_omitted_from_data(). 
Backport of fd75c8f2b7070774f6e90f408cb5cddf65b8734e from master
 2017-03-07 13:56:45 -05:00
Claude Paroz
ca58a405fc [1.11.x] Refs #27622 -- Fixed a regression in JSON content-type detection 
A JSON Content-Type can contain further content, like charset for example.
Backport of 145f6c3ed6e8856078e2d04ff2567e9fb4a17930 from master.
 2017-03-07 17:00:20 +01:00
Claude Paroz
77c3cbe08a [1.11.x] Renamed a test variable to prevent possible conflict with imports 
Backport of 324c4b6371cf635effd4d5ee7315c7311fbaf1b6 from master.
 2017-03-07 16:33:16 +01:00
Tim Graham
6392bf26ca [1.11.x] Fixed #27900 -- Made escapejs escape backticks for use in ES6 template literals. 
Backport of 6ae1b04fb584db0fdb22b8e287784c4ed3ac62ac from master
 2017-03-04 09:04:40 -05:00
Tim Graham
1f20326db0 [1.11.x] Fixed #27887 -- Fixed URLs check crash with namespaced URLs inside non-namespaced URLs. 
Backport of b23d264046db1c8f58a174b9be27ee760341ba06 from master
 2017-03-03 10:52:48 -05:00
David Szotten
93c8e2d50d [1.11.x] Fixed #27889 -- Fixed incorrect check error if ModelAdmin.ordering refers to 'pk'. 
Backport of d82ee32aac323b7260cc95278c69b81d98dbd00a from master
 2017-03-02 10:58:47 -05:00
Tim Graham
6109a04251 [1.11.x] Fixed a backends test with psycopg2 2.7. 
Backport of 49a63d08d3b3e2ac32e391d1413a4ac99429e4af from master
 2017-03-01 13:20:23 -05:00
Matthew Schinckel
2864bb3ba6 [1.11.x] Fixed #27862 -- Fixed incorrectly quoted table aliases in Subquery SQL. 
Add aliases from resolved querysets to the parent query's external
aliases to prevent those aliases from being quoted.

Thanks to Vasily Stepanov for the report and Tim Graham for the review.

Backport of f48bc7c3dbd204eefb3c19016b1e4906ac26bee3 from master
 2017-03-01 08:21:12 -05:00
Chris Lamb
5a85f2ca5f [1.11.x] Fixed #27873 -- Fixed crash in setup_test_environment() if ALLOWED_HOSTS is a tuple. 
Regression in 17e661641ddaf8266e7430d83cfb2039abc55df7

Backport of 339d526d55baffea3bd3cecd0e07ddf644028e8c from master
 2017-02-24 14:06:42 -05:00
Tim Graham
53f5dc10cd [1.11.x] Refs #25187 -- Fixed AuthBackend.authenticate() compatibility for signatures that accept a request kwarg. 
Backport of c31e7ab5a4b062225bc4f6b5cae065325dd30f1f from master
 2017-02-24 13:59:34 -05:00
Chris Lamb
0417bf47a6 [1.11.x] Fixed #27874 -- Fixed URL namespace warning (urls.W005) for nested namespaces. 
Backport of 8d4885ede578b5beef7626cd31bbd19a95bd678a from master
 2017-02-24 13:59:28 -05:00
Vytis Banaitis
d03153e3b0 [1.11.x] Fixed #27856 -- Improved accuracy of date subtraction on PostgreSQL. 
Accuracy was incorrect when dates differ by a month or more.

Backport of 4045fd56cb0f83d0f78de9aca073c7104e4cf8fd from master
 2017-02-21 12:49:31 -05:00
Collin Anderson
808d33c1bf [1.11.x] Fixed #27850 -- Made RelatedFieldWidgetWrapper call render() of the wrapped widget. 
Backport of fb7e0e01af5364987de7fc95ae4d66e22130f2bc from master
 2017-02-20 08:48:17 -05:00
Mariusz Felisiak
87775b64cd [1.11.x] Fixed #27843 -- Fixed truncate_name() when the name contains a username. 
Backport of b9351905721771fb49ea0020c751ae4280754c43 from master
 2017-02-17 09:44:36 -05:00
Mariusz Felisiak
a66f448f11 [1.11.x] Added tests for db.backends.utils.truncate_name(). 
Backport of 1f7ca858664491589ba400419a491dd0a9af5dff from master
 2017-02-17 09:30:32 -05:00
Vytis Banaitis
eedf276ed1 [1.11.x] Fixed #27828 -- Fixed a crash when subtracting Integer/DurationField from DateField on Oracle/PostgreSQL. 
Backport of d5088f838d837fc9e3109c828f18511055f20bea from master
 2017-02-16 12:35:40 -05:00
Tim Graham
2f6cdc09c4 [1.11.x] Fixed #27135 -- Made index introspection return Index.suffix. 
Backport of b008f7cc5655d01817a8825e6317877b43c92181 from master
 2017-02-15 21:07:53 -05:00
Markus Holtermann
f5ff5be2c1
[1.11.x] Fixed #27840 -- Fixed KeyError in PasswordResetConfirmView.form_valid(). 
When a user is already logged in when submitting the password and
password confirmation to reset a password, a KeyError occurred while
removing the reset session token from the session.

Refs #17209

Thanks Quentin Marlats for the report and Florian Apolloner and Tim
Graham for the review.
 2017-02-15 00:38:57 +01:00
Tim Graham
da2e92d25e [1.11.x] Fixed GeoIP test failure with the latest data. 2017-02-14 09:08:17 -05:00
amalia
b54fff2938 [1.11.x] Fixed #27820 -- Fixed RequestDataTooBig/TooManyFieldsSent crash. 
Backport of 2f10216f84b55920de25422842a66260219e393f from master
 2017-02-13 16:43:23 -05:00
Robert Roskam
c091614450 [1.11.x] Fixed #27367 -- Doc'd and tested reversing of URLs with the same name. 
Thanks Reinout van Rees for contributing to the patch.

Backport of 98bcc5d81bca578f3a5b4d47907ba4ac40446887 from master
 2017-02-11 09:02:30 -05:00
Mads Jensen
ded0632d94 [1.11.x] Refs #26610 -- Added CIText mixin and CIChar/Email/TextField. 
Backport of fb5bd38e3b83c7f0d1011de80f922fc34faf740b from master
 2017-02-11 07:16:58 -05:00
Tim Graham
9658f0d266 [1.11.x] Fixed #27722 -- Reallowed using django.Template in {% include %}. 
Backport of fe2d2884345e1e6a1daadd76e9404c62791ab589 from master
 2017-02-11 06:52:14 -05:00
Tim Graham
eeb28f4751 [1.11.x] Fixed #27742 -- Reverted "Fixed #24607 -- Serialized natural keys in multi-table inheritance models." 
This reverts commit 74a575eb7296fb04e1fc2bd4e3f68dee3c66ee0a as it causes
unexpected migrations and doesn't seem to be the best solution.

Backport of 0595bca221825c0c6bd572a32f3bf9eff7069328 from master
 2017-02-11 06:40:30 -05:00
ClairePhila
4101b57b19 [1.11.x] Refs #27148 -- Fixed UUIDField.to_python(None) crash. 
Regression in 2f9861d823620da7ecb291a8f005f53da12b1e89.

Backport of d26413113c1a5c95218fe4e43a684a2fe1ad1bff from master
 2017-02-10 14:34:14 -05:00
Zoltan Gyarmati
f94e1a5de4 [1.11.x] Fixed #27815 -- Made LoginView pass the request kwarg to AuthenticationForm. 
Backport of 41ba27fefdd313333d94408802afff36a9eedb83 from master
 2017-02-07 09:42:21 -05:00