Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
25,946 Commits 26 Branches 382 Tags
Commit Graph

25946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Varma
021f67be4b [2.1.x] Removed "encoding" description in GIS tutorial. 
An omission in 388165ade4219aeefac1e231c1d44c51a7b62829.
Backport of 3deea61f266b8e5c7c6d70ba12e2b95050dfb557 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 4e78e389b16fbceb23d5236ee1650b213e71c968 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 a29fce89845cc9ca2fa96d8880104726b75dfbd6 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 cf546e11ac76c8dec527e39ff8ce8249a195ab42, this is the
canonical way to invoke the static tag.
Backport of 084573c7156530047bec2c19e732423fa9d0ec13 from master.
 2018-10-18 19:20:15 -04:00
Tim Graham
9982babbf9 [2.1.x] Replaced CVE/ticket roles with extlinks. 
Backport of 44f98f78804627839d5f0a8b3a32bfbb4546ff52 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 fc6528b25ab1834be1a478b405bf8f7ec5cf860c.

Backport of 834c4ec8e4cfc43acf0525e0a4d8c914534f6afd,
217f82d7139fd32f07adbfa92c5fb383d0ade577, and
dc5e75d419893bde33b7e439b59bdf271fc1a3f2 from master.
 2018-10-17 11:40:02 -04:00
Tom Dyson
0f611fb1fa [2.1.x] Removed obsolete "ugly URL" reference. 
Backport of 6752c2756eb9be28a37021d664b805ec169369d6 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 38f3de86bd0bfa4c9b57db1237fa55e9fa88bc6e from master.
 2018-10-16 16:11:13 -04:00
Taoufik
6efe2ba057 [2.1.x] Fixed typo in django/utils/datastructures.py. 
Backport of f07091a30fbac713a03d292ec1c901f0a7757440 from master
 2018-10-14 11:20:52 -04:00
Peter Inglesby
1996889522 [2.1.x] Removed unused fields from aggregation docs. 
Backport of a1ffbfb80166bf183552363419e5884a51158405 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 cecd6561840805c67dd828f881a26dc72de4c823 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 1b49b792e9f0e6a5ae22f49f75586847e7e183bf 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 b8b1d8cad6ce5b15f6527aa14cc81ad7a0d00efe 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 82f286cf6f198d37850d3c5df637b5665566a66b from master.
 2018-10-09 20:52:43 -04:00
Jon Dufresne
ec0803b1be [2.1.x] Capitalized "Python" in docs and comments. 
Backport of e90af8bad44341cf8ebd469dac57b61a95667c1d 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
301de774c21d055e9e5a7073e5bffdb52bc71079.
Backport of f5d9ee11a2c76ba1cf7e3424d15286da121a004b from master
 2018-10-04 09:40:43 -04:00
ovalseven8
9e5f4bcedb [2.1.x] Clarified when QuerySet.select_for_update() locks. 
Backport of d093e01ec05f661063507503fdf294eb6ee54dee 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 18e4ade79ef145401b899ab539322c95d2a64266 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 f3f31b0fc26f772b198c9683a427f2f7fe208c37.
 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 a47dd99cc6883fe3e35895e8c5d4bb53996bd184.
 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 bdae19cf6395d6bfee80864d9e87c4aec241eceb 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 efd8a82e268a82b3ad0be77bd5b4548c30bcb4d7 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
3a148f958dddd97c1379081118c30fbede6b6bc4.
Backport of 3212008ba602668f7923852454b508a400dd732e 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 31edb106b5ce3aa125121b748782743f19338307 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 7598cd4748dc402b0209e5eedb6d2a83c3da1620 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 7206601040304c762f5014048fda6fa68ec1ee84 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 f83a689f617d119a2bed23032919cea98c424c58 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 b3b47bf5156d400595363fa0029e51ce3f974ff0 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 92ccc3917058b1025b2d657ffdf3c21eb8009f7b 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 0b3b7c4b0ab2567cfe5df3ac19563d4a59276cb1 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 dc28c0faf33b69df20ff8b4c244b48d3f7e5c77d 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 2e86710dac8e1965e39461d0f43eec29d33a75c2 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 7040e638b960c122cd71eccac2b1bf2fe8d0f5da 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. 2.1.2 2018-10-01 10:18:50 +02:00
Carlton Gibson
b493e8f4f9 [2.1.x] Added release date for 2.1.2 release. 
Backport of fb7fd884a147da9c095acef1172eaeea5ed9f059 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 a7284cc0c3620030b43034cdf41216c0941bf411 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 a4932be483368d17d907d8d5492c4701a6631d87 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 d37ed40048b749c75f7f54ef8b96d8e738f10719 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 ddcb9e806275114c91bbed90bc917374ba08a9ae 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 fb2964a4106b1282c4179b6fbbd0374f5be1ccac 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 e40e7026cad400d720963aea0ba156a19f83b058 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 0899d583bdb140910698d00d17f5f1abc8774b07.

Thanks Tim Graham for the review and Jani Tiainen for help.
Backport of 024abe5b82d95ee60cb18a77ebf841ad715467fa 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 51da347c32f5af1e8de4be77c15d6a35b58d4059 from master.
 2018-09-26 13:37:12 -04:00
Mariusz Felisiak
1f8a5d4fac [2.1.x] Made DatabaseWrapper.oracle_version() return a full version tuple. 
Backport of 90d93a1b425c0e6e3d88afa9fff78790300e1e38 from master
 2018-09-26 08:54:51 +02:00
Oleg
cdb8ee741d [2.1.x] Fixed #29778 -- Fixed quoting of unique index names. 
Regression in 3b429c96736b8328c40e5d77282b0d30de563c3c.
Backport of d1d5c97bc2821bf8c0f4b2d9c7ab16200845b494 from master.
 2018-09-25 16:10:47 -04:00
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
Jon Dufresne
c6d147bed8 [2.1.x] Refs #29784 -- Changed Python f-string link to use intersphinx. 
Backport of 3a3d159ab66c32dbf7331676267a04afa20857d0 from master.
 2018-09-25 10:21:36 +02:00