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

23923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sergey Kholodilov
993406770a [1.11.x] Fixed Python 2/Windows libgdal crash if PATH contains non-ASCII symbols. 2017-03-09 09:12:08 -05:00
David D Lowe
c7351eaa92 [1.11.x] Fixed #27911 -- Doc'd how to register custom User with admin. 
Backport of 9269dec05efae5deb89912a5b9a98ae75acdfff9 from master
 2017-03-08 12:15:22 -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
Tim Graham
679560b7d8 [1.11.x] Added stub release notes for 1.10.7. 
Backport of 6c5348b9d2f49e0b06167ba782829e9754c05bf5 from master
 2017-03-07 13:05:56 -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
4852276aba [1.11.x] Fixed #26817 -- Doc'd downsides and alternatives to Jinja2 context processors. 
Thanks Aymeric Augustin and Carl Meyer.

Backport of dacdcec767ae23b4c7107bfe447d29a1c88af48c from master
 2017-03-06 13:35:10 -05: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
albertoconnor
f834c278b5 [1.11.x] Fixed typo in docs/howto/custom-template-tags.txt. 
Backport of 2863e79a5c061b58e57ea7edc12701010725537c from master
 2017-03-01 15:42:17 -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
Adam Johnson
6382a60f28 [1.11.x] Fixed typo in docs/releases/1.10.6.txt. 
Backport of c1d652c62f4d03a36dfe5c3a93ab68076825423c from master
 2017-03-01 10:11:51 -05:00
Tim Graham
bb049268c6 [1.11.x] Added release date for 1.10.6. 
Backport of 4f22505a9f96688f27089b49983efd5c49381298 from master
 2017-03-01 08:27:46 -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
Tim Graham
3a3145bfcd [1.11.x] Refs #27843 -- Fixed 'invalid escape sequence' warning in truncate_name(). 
Backport of 82026d61a383d07cd840a0d30443ee66bd99798b from master
 2017-02-27 09:31:06 -05:00
Alexkane
c231e965e7 [1.11.x] Made a few queryset lookup examples consistent. 
Backport of b427f0d674362d22c063852754914d9315cbc2fa from master
 2017-02-24 16:35:24 -05:00
Tim Graham
22eb15a18c [1.11.x] Fixed #27875 -- Doc'd manager_inheritance_from_future in manager docs. 2017-02-24 16:15:36 -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
Claude Paroz
a86ec78fe6 [1.11.x] Completed 1.10.6 release note 2017-02-23 10:27:28 +01:00
Manatsawin Hanmongkolchai
45b301d078 [1.11.x] Updated Thai (th) locale formats. 
Backport of 46e51632dc2946ad735e9bba6d11080d81af8008 from master
 2017-02-22 10:19:19 -05:00
Asif Saifuddin Auvi
faa14f358a [1.11.x] Updated Bengali (bn) locale formats. 
Backport of 9d984f88063b0323c12e158f7615ece2e5893566 from master
 2017-02-22 09:28:09 -05:00
Timothy Allen
138b7b07c8 [1.11.x] Used "0" ip shortcut for runserver example. 
Backport of 7d20a7d88a81a041af4b66296971834ee6fa3512 from master
 2017-02-21 19:13:22 -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
Tim Graham
d53fc7614d [1.11.x] Refs #23151 -- Removed RegexField's unused error_message parameter. 
Should have been removed in b6ea1961eb6816dee4370fb0ebd49dba29478db1.

Backport of afcf44c10108141e66a8aef0a3cbc151b1c16855 from master
 2017-02-20 19:09:43 -05:00
Tim Graham
2a0d8ae9bd [1.11.x] Bumped version for 1.11 beta 1. 1.11b1 2017-02-20 18:11:25 -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
Alexey Rogachev
447c6802f0 [1.11.x] Fixed typo in DurationField's docstring. 
Backport of c743af82cf56a915bf5d5d53a063892394cb75cf from master
 2017-02-20 08:45:01 -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
4f0185aac3 [1.11.x] Clarified that creating a pull request for the tutorial isn't necessary. 
Backport of 57292725093eb470851b35174c10573bbf717117 from master
 2017-02-16 11:34:21 -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
Joon Hwan 김준환
197a2cd487 [1.11.x] Made a sentence in default_if_none docs consistent with other template filters. 
Backport of a7214f0e84913a27e0b73de89d4c827ef1c53b94 from master
 2017-02-15 08:42:24 -05:00
Tim Graham
2b8a345996 [1.11.x] Removed docs/internals/roles.txt. 
It's moved to https://www.djangoproject.com/foundation/teams/.

Backport of 3d14cbc86781ea1051af7f0c421bee3ecf2f9842 from master
 2017-02-15 08:32:48 -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
Tim Graham
8bf9967e7b [1.11.x] Fixed #27823 -- Updated mod_wsgi example to use WSGIPythonHome. 
Backport of 103e6cf26c17ae650b7caa3956b87a215334d761 from master
 2017-02-13 19:52:33 -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
Claude Paroz
ad0b22d730 [1.11.x] Removed WSGIServer.server_bind() identical to parent version 
The method customization was removed in 2ca00faa9137.
Backport of d4b00c5c24b72f7b0f22f1f9a69c48fc11bf4ab8 from master.
 2017-02-11 11:20:17 +01: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