p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,100 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

26100 Commits

Author SHA1 Message Date
Mariusz Felisiak 5aeffc0535 [2.1.x] Ignored flake8 W504 warnings. 
W504 is mutually exclusive with W503 that we follow.

Backport of 58d1e9aa8a from master.
 2018-10-24 09:25:34 -04:00
Jon Dufresne 8a348c5fd0 [2.1.x] Refs #29877 -- Made diveinto.org URLs HTTPS. 
Backport of 136a900ef9 from master
 2018-10-23 15:03:40 +02:00
za fbd95ce9bb [2.1.x] Fixed #29877 -- Replaced diveintopython3.net with diveinto.org/python3/. 
Backport of b0d716cbff from master
 2018-10-23 11:56:41 +02:00
Tim Graham 54732e2891 [2.1.x] Fixed #29880 -- Fixed typo in docs/topics/auth/default.txt. 
Backport of 043407ec7e from master.
 2018-10-22 15:19:53 -04:00
Atul Varma 021f67be4b [2.1.x] Removed "encoding" description in GIS tutorial. 
An omission in 388165ade4.
Backport of 3deea61f26 from master
 2018-10-21 12:14:57 -04:00
Adam Allred 0d5d8ed322 [2.1.x] Fixed #29774 -- Fixed django-admin shell hang on startup. 
sys.stdin.read() blocks waiting for EOF in shell.py which will
likely never come if the user provides input on stdin via the
keyboard before the shell starts. Added check for a tty to
skip reading stdin if it's not present.

This still allows piping of code into the shell (which should
have no TTY and should have an EOF) but also doesn't cause it
to hang if multi-line input is provided.

Backport of 4e78e389b1 from master.
 2018-10-19 20:45:55 -04:00
Tim Graham 4acdba42a6 [2.1.x] Fixed #29858 -- Clarified docs regarding CSRF token header name. 
Backport of a29fce8984 from master.
 2018-10-19 19:35:25 -04:00
Andy Chosak 822f111b86 [2.1.x] Updated Jinja2 static tag example to use django.templatetags. 
As of cf546e11ac, this is the
canonical way to invoke the static tag.
Backport of 084573c715 from master.
 2018-10-18 19:20:15 -04:00
Tim Graham 9982babbf9 [2.1.x] Replaced CVE/ticket roles with extlinks. 
Backport of 44f98f7880 from master.
 2018-10-17 12:05:50 -04:00
aspalding 0df7ea1b87 [2.1.x] Fixed #29838 -- Fixed crash when combining Q objects with __in lookups and lists. 
Regression in fc6528b25a.

Backport of 834c4ec8e4,
217f82d713, and
dc5e75d419 from master.
 2018-10-17 11:40:02 -04:00
Tom Dyson 0f611fb1fa [2.1.x] Removed obsolete "ugly URL" reference. 
Backport of 6752c2756e from master.
 2018-10-17 10:21:12 -04:00
Çağıl 554fd6cd76 [2.1.x] Added a paragraph in docs/intro/contributing.txt. 
Backport of 38f3de86bd from master.
 2018-10-16 16:11:13 -04:00
Taoufik 6efe2ba057 [2.1.x] Fixed typo in django/utils/datastructures.py. 
Backport of f07091a30f from master
 2018-10-14 11:20:52 -04:00
Peter Inglesby 1996889522 [2.1.x] Removed unused fields from aggregation docs. 
Backport of a1ffbfb801 from master
 2018-10-13 21:14:14 -04:00
Adam Johnson 4d7fbbdd7d [2.1.x] Simplified deployment checklist docs on customizing error views. 
Backport of cecd656184 from master.
 2018-10-11 10:26:03 -04:00
Andrea Rabbaglietti b9b284831a [2.1.x] Emphasized that ForeignKey.on_delete doesn't create a SQL constraint. 
Backport of 1b49b792e9 from master.
 2018-10-10 14:57:01 -04:00
Kate Berry 8985759f72 [2.1.x] Improved tone in docs/ref/settings.txt. 
Backport of b8b1d8cad6 from master.
 2018-10-09 20:53:53 -04:00
Jon Dufresne 6cb5285f29 [2.1.x] Refs #29784 -- Switched to https:// links where available. 
Backport of 82f286cf6f from master.
 2018-10-09 20:52:43 -04:00
Jon Dufresne ec0803b1be [2.1.x] Capitalized "Python" in docs and comments. 
Backport of e90af8bad4 from master.
 2018-10-09 20:50:31 -04:00
Jon Dufresne d1b25a64c2 [2.1.x] Refs #27778 -- Removed "The database API" section from "Unicode data" docs. 
Support for passing bytestrings to the database API was removed in
301de774c2.
Backport of f5d9ee11a2 from master
 2018-10-04 09:40:43 -04:00
ovalseven8 9e5f4bcedb [2.1.x] Clarified when QuerySet.select_for_update() locks. 
Backport of d093e01ec0 from master.
 2018-10-03 15:35:20 -04:00
Adam Johnson 173e242d71 [2.1.x] Fixed #28034 -- Updated the contributing tutorial to use an imaginary ticket. 
Backport of 18e4ade79e from master.
 2018-10-03 15:09:47 -04:00
Carlton Gibson 5045f8af85 Revert "[2.1.x] Refs #27795 -- Removed force_bytes() usage in sessions." 
This reverts commit f3f31b0fc2.
 2018-10-03 15:14:27 +02:00
Carlton Gibson 54eedddb50 Revert "[2.1.x] Refs #27795 -- Removed force_bytes() usage in MySQL backend." 
This reverts commit a47dd99cc6.
 2018-10-03 15:14:03 +02:00
Jon Dufresne f3f31b0fc2 [2.1.x] Refs #27795 -- Removed force_bytes() usage in sessions. 
SessionBase.decode() is the inverse operation to SessionBase.encode().
As SessionBase.encode() always returns a string, SessionBase.decode()
should always be passed a string argument. Fixed the file backend, which
was the only backend still passing a bytestring.

Backport of bdae19cf63 from master
 2018-10-03 11:33:12 +02:00
Jon Dufresne a47dd99cc6 [2.1.x] Refs #27795 -- Removed force_bytes() usage in MySQL backend. 
The mysqlclient cursor attribute `_last_executed` is always stored as
bytes. Decode it.

TextField values are already type str. No need to decode.

Backport of efd8a82e26 from master
 2018-10-03 10:42:35 +02:00
Jon Dufresne 490f4fa574 [2.1.x] Corrected docs to say that all templates are text strings. 
Support for bytestring templates was removed in
3a148f958d.
Backport of 3212008ba6 from master
 2018-10-03 10:06:32 +02:00
Tim Graham 95c2ce678f [2.1.x] Removed docs for obsolete limitations of inspectdb. 
Backport of 31edb106b5 from master.
 2018-10-02 13:29:32 -04:00
Jon Dufresne f0759305d0 [2.1.x] Fixed #29813 -- Fixed DatabaseOperation test when run in isolation on MySQL. 
Backport of 7598cd4748 from master.
 2018-10-02 08:22:51 -04:00
Tim Graham 39fd80470c [2.1.x] Fixed crash building translated docs since Sphinx 1.8. 
Backport of 7206601040 from master.
 2018-10-01 20:44:57 -04:00
Cammil Taank cd9391ca3d [2.1.x] Fixed #29758 -- Documented how to test custom error views. 
Backport of f83a689f61 from master
 2018-10-01 18:39:11 -04:00
Jon Dufresne d95d7d6896 [2.1.x] Added tests for using bytearray with BinaryField and corrected docs. 
Backport of b3b47bf515 from master.
 2018-10-01 09:16:47 -04:00
Carlton Gibson 4a7ea6ba58 [2.1.x] Adjusted text for CVE-2018-16984 in security release archive. 
Backport of 92ccc39170 from master
 2018-10-01 15:05:28 +02:00
Carlton Gibson 8fb3c2fe2a [2.1.x] Added CVE-2018-16984 to the security release archive. 
Backport of 0b3b7c4b0a from master
 2018-10-01 12:01:22 +02:00
Carlton Gibson d53e91d43d [2.1.x] Added stub release notes for 2.1.3 release. 
Backport of dc28c0faf3 from master
 2018-10-01 12:01:12 +02:00
Carlton Gibson 5da80967bc [2.1.x] Added stub release notes for 2.0.10 release. 
Backport of 2e86710dac from master
 2018-10-01 12:01:01 +02:00
Carlton Gibson ceac3aac59 [2.1.x] Added stub release notes for 1.11.17 release. 
Backport of 7040e638b9 from master
 2018-10-01 12:00:48 +02:00
Carlton Gibson 6da866c047 [2.1.x] Post-release version bump. 2018-10-01 11:40:27 +02:00
Carlton Gibson 38e2fdadfd [2.1.x] Bumped version for 2.1.2 release. 2018-10-01 10:18:50 +02:00
Carlton Gibson b493e8f4f9 [2.1.x] Added release date for 2.1.2 release. 
Backport of fb7fd884a1 from master
 2018-10-01 10:16:48 +02:00
Tim Graham 176d20b92a [2.1.x] Fixed #29809 -- Fixed a crash when a "view only" user POSTs to the admin user change form. 
Backport of a7284cc0c3 from master
 2018-10-01 10:16:15 +02:00
Carlton Gibson c4bd5b597e Fixed CVE-2018-16984 -- Fixed password hash disclosure to admin "view only" users. 
Thanks Claude Paroz & Tim Graham for collaborating on the patch.

# Conflicts:
#	tests/auth_tests/test_views.py
 2018-10-01 10:15:50 +02:00
Carlton Gibson f86100ab18 [2.1.x] Added release date for 2.0.9 release. 
Backport of a4932be483 from master
 2018-10-01 09:56:20 +02:00
Carlton Gibson 991f75fb0a [2.1.x] Added release date for 1.11.16. 
Backport of d37ed40048 from master
 2018-10-01 09:35:26 +02:00
Claude Paroz d5ed08263b [2.1.x] Updated translations from Transifex 2018-09-29 16:03:27 +02:00
Claude Paroz 7b444bf5f7 [2.1.x] Refs #21408 -- Updated naturaltime translation test. 
Upcoming German translations will not differ for past and future naturaltime
translations. Using Czech language instead.
Backport of ddcb9e8062 from master
 2018-09-29 15:07:09 +02:00
Jon Dufresne a6e7ebf4ee [2.1.x] Added test of filtering on BinaryField and corrected docs. 
Backport of fb2964a410 from master.
 2018-09-26 15:07:06 -04:00
Stephen James f5335bc745 [2.1.x] Fixed #29683 -- Added view permission to docs. 
Backport of e40e7026ca from master.
 2018-09-26 15:06:57 -04:00
Mariusz Felisiak 5aeced6dcd
[2.1.x] Fixed #29630 -- Fixed crash of sliced queries with multiple columns with the same name on Oracle 12.1. 
Regression in 0899d583bd.

Thanks Tim Graham for the review and Jani Tiainen for help.
Backport of 024abe5b82 from master
 2018-09-26 20:24:20 +02:00
Sergey Fedoseev 5082108559 [2.1.x] Fixed #29795 -- Confirmed support for PostGIS 2.5. 
Backport of 51da347c32 from master.
 2018-09-26 13:37:12 -04:00