mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-07 23:16:46 +00:00
Code Issues 32 Releases Wiki Activity
26,583 Commits 29 Branches 441 Tags
Commit Graph

26583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mariusz Felisiak
cf903c4c0b
[2.2.x] Reverted "Fixed relative paths imports per isort 4.3.5." 
This reverts commit 463fe11bc8b2d068e447c5df677e7a31c2af7e03 due to
restore of relative paths sorting from isort < 4.3.5 in isort 4.3.10.
Backport of b435f82939edf70674856e0e1cd63973c2e0a1d1 from master
 2019-03-03 19:35:37 +01:00
Tobias Bengfort
18211d0a4d [2.2.x] Clarified permission-related docs. 
Backport of 632d4861ddb99a2c9d11642fcfa4ad542b427d6b from master
 2019-02-28 15:28:56 +01:00
Matthias Kestenholz
459f7c804d [2.2.x] Fixed #30179 -- Fixed form Media merging when pairwise merging is insufficient. 
Thanks gasman for the tests, and codingjoe and timgraham for the review.

Backport of 231b513926f2bfd71f08058ce5013bd81678ac01 from master.
 2019-02-27 17:16:58 -05:00
Matthias Kestenholz
77e53da127 [2.2.x] Refs #30179 -- Moved topological sort functions to django.utils. 
Backport of e04209e181c99ac16ca769d115ac640015a83757 from master.
 2019-02-27 17:16:48 -05:00
Tim Graham
d29c8ea124 [2.2.x] Refs #29523 -- Updated admin's collapse.min.js. 
Omitted in ba83378a7762c51be235b521aa5b48233d6c6c82.

Backport of 93e892bb645b16ebaf287beb5fe7f3ffe8d10408 from master.
 2019-02-27 16:28:21 -05:00
shiningfm
4dac17ac93 [2.2.x] Fixed #30215 -- Fixed autoreloader crash for modules without __spec__. 
Regression in c8720e7696ca41f3262d5369365cc1bd72a216ca.
Backport of 99cfb28e995388db109e2f2ed15307f09945dda8 from master.
 2019-02-27 10:35:45 -05:00
Tom Forbes
7331dd8a98 [2.2.x] Refs #27685 -- Removed "watchman unavailable" message. 
Backport of 65ef5f467ba84c26392a157de1622d805401ec7d from master
 2019-02-25 21:42:14 -05:00
Matthias Kestenholz
d59c3fc167 [2.2.x] Fixed #30208 -- Fixed login header height and alignment in the largest breakpoint. 
Backport of c41e6c4eb8049a1f0efcfd7c7fc3b3ca11207b5a from master.
 2019-02-25 15:00:27 -05:00
Tim Graham
8205116a79 [2.2.x] Refs #29683 -- Updated multi-db docs for view permission. 
Backport of 50f09264ae8ab04824fcc6554e8c184378ad2f81 from master
 2019-02-25 14:57:12 -05:00
Mariusz Felisiak
62f28f37bf
[2.2.x] Fixed documentation of database representation for ManyToManyField. 
Backport of b0799f5d86b6c0ccb1dcba6e0d2eee336f7f5928 from master
 2019-02-25 20:08:11 +01:00
Mariusz Felisiak
370a145996
[2.2.x] Fixed relative paths imports per isort 4.3.5. 
Backport of 463fe11bc8b2d068e447c5df677e7a31c2af7e03 from master
 2019-02-25 19:50:12 +01:00
Tim Graham
9a5f87a69c [2.2.x] Fixed a failure when running tests on systems with SQLite < 3.8.3. 
Backport of 36300ef336e3f130a0dadc1143163ff3d23dc843 from master.
 2019-02-21 16:39:42 -05:00
Ran Benita
a9bd914a22 [2.2.x] Removed an outdated comment on DefaultConnectionProxy. 
Backport of 21ff23bfeb4014bceaa3df27677fb68409c0634d from master
 2019-02-20 11:31:57 -05:00
Simon Charette
7f25344c2e [2.2.x] Fixed #30193, Refs #28478 -- Avoided PostgreSQL connection health checks on initialization. 
This addressed a regression introduced by a96b9019320ed8236659ee520a7a017c1bafbc6f as identified by Ran Benita.
Backport of 7071f8f2729295b0da77b6c651966dc32c71f1ab from master
 2019-02-20 11:01:03 +01:00
Mariusz Felisiak
9278acfd12
[2.2.x] Fixed #30187 -- Moved "install Django" command to a console box. 
Backport of edec11ce86a1a0d9e4c5a2a0df6acaf655041c24 from master
 2019-02-16 07:58:55 +01:00
Jon Dufresne
37cc6a9dce [2.2.x] Fixed #30171 -- Fixed DatabaseError in servers tests. 
Made DatabaseWrapper thread sharing logic reentrant. Used a reference
counting like scheme to allow nested uses.

The error appeared after 8c775391b78b2a4a2b57c5e89ed4888f36aada4b.
Backport of 76990cbbda5d93fda560c8a5ab019860f7efaab7 from master.
 2019-02-14 10:05:13 -05:00
Tim Graham
07b44a251a [2.2.x] Removed docs of unused libgeoip1/python-gdal packages. 
Backport of 21f9d437374ee078ee46e23b64efa3d52ca6f49a from master.
 2019-02-14 09:46:45 -05:00
Tim Graham
6cdc7ae23f [2.2.x] Refs #25175 -- Renamed test file referencing the old postgresql_psycopg2 engine. 
Backport of ddb293685235fd09e932805771ae97f72e817181 from master
 2019-02-13 17:27:27 -05:00
Dan Davis
5e94c817ee [2.2.x] Fixed #30184 -- Removed ellipsis characters from shell output strings. 
Partially reverted 50b8493581fea3d7137dd8db33bac7008868d23a (refs #29654)
to avoid a crash when the user shell doesn't support non-ASCII characters.
Backport of 2bd8df243ac6fc35e58c9fe90b20c9e42519a5ac from master.
 2019-02-13 14:00:53 -05:00
Hasan Ramezani
f2b460231d [2.2.x] Fixed #29943 -- Doc'd that admin changelist may add pk to ordering. 
Backport of f63811f4813f0e0439e140a97eeba18a5017e858 from master.
 2019-02-12 21:36:07 -05:00
Tim Graham
c3655b1528 [2.2.x] Refs #29478 -- Clarified cached_property 2.2 release note. 
Backport of 3b64e2b77570c73a0d7092124fa73439e0fb4305 from master.
 2019-02-12 18:35:03 -05:00
Claude Paroz
28a6046b54 [2.2.x] Doc'd database functions for overlaps lookup. 
Backport of 8cf9dbee6aeca57ab4dac986e46b79a2d234f703 from master
 2019-02-12 15:43:11 -05:00
Jonatan Alexis Anauati
d2f942737c [2.2.x] Fixed indentation in docs/topics/templates.txt. 
Backport of 85ada61ac492ec6031db813463f4ea6820fee20b from master.
 2019-02-11 16:52:41 -05:00
Tim Graham
74428138cc [2.2.x] Added CVE-2019-6975 to the security release archive. 
Backport of d6e5aad5c7eba3d8061c09902de16cd2b22619af from master.
 2019-02-11 16:14:50 -05:00
Tim Graham
f548ac7fa5 [2.2.x] Refs #30177 -- Forwardported 2.0.13 release notes. 
Backport of 1b8f552b08eb7642be598ba7512e7eaecefbdc6d from master.
 2019-02-11 15:52:15 -05:00
Carlton Gibson
1672ed5ccf [2.2.x] Refs #30175 -- Added release notes for 2.1.7, 2.0.12, and 1.11.20 releases. 
Backport of b39bd0aa6d5667d6bbcf7d349a1035c676e3f972 from master
 2019-02-11 15:47:54 +01:00
Semen Zhydenko
a536cf1f9f [2.2.x] Fixed spelling mistakes in comments and tests. 
Backport of 255d6a26a8839180b495c75f256641415c516b6f from master.
 2019-02-11 08:56:10 -05:00
Atul Varma
1092bf02e6 [2.2.x] Fixed typo in docs/releases/2.2.txt. 
Backport of b6bb912e9cd2d4497f010a362eff4662ba10f653 from master.
 2019-02-11 08:54:23 -05:00
Carlton Gibson
130d2d3072 [2.2.x] Bumped version for 2.2b1. 2.2b1 2019-02-11 11:21:19 +01:00
Carlton Gibson
83ab3e2664 [2.2.x] Fixed CVE-2019-6975 -- Fixed memory exhaustion in utils.numberformat.format(). 
Thanks Sjoerd Job Postmus for the report and initial patch.
Thanks Michael Manfre, Tim Graham, and Florian Apolloner for review.

Backport of 402c0caa851e265410fbcaa55318f22d2bf22ee2 from master
 2019-02-11 11:10:38 +01:00
Tim Graham
b89d31d2dc [2.2.x] Fixed #30169 -- Removed SAP SQL Anywhere from "3rd party database backends" as it's inactive. 
Backport of 56b50cbf73ecfd4577bb7cfe8dc8ccd4befd7e00 from master.
 2019-02-09 18:38:43 -05:00
Matthias Kestenholz
e1bd94496b [2.2.x] Fixed #30153 -- Fixed incorrect form Media asset ordering after three way merge. 
Delaying merging assets as long as possible avoids introducing
incorrect relative orderings that cause a broken final result.
Backport of 959d0c078a1c903cd1e4850932be77c4f0d2294d from master.
 2019-02-09 09:39:15 -05:00
Mariusz Felisiak
d03e5961aa
[2.2.x] Removed extra characters in docs header underlines. 
Backport of 25829197bb94585e94695360065ac614aa9e6a56 from master
 2019-02-08 21:39:54 +01:00
Carlton Gibson
941109ccb3 [2.2.x] Added stub release notes for security releases. 
Backport of 5cc6f02f91e8860c867cc68cf42e66b5bb54c63d from master
 2019-02-07 15:47:52 +01:00
Mariusz Felisiak
0aff35459d
[2.2.x] Updated Oracle docs links to Oracle 18c. 
Backport of 759a9b710c0e5a6009cfba406ff562919fa70ef0 from master
 2019-02-07 10:03:11 +01:00
Andy Chosak
d293948938 [2.2.x] Refs #15372 -- Removed obsolete docs about manage.py setting sys.path. 
Backport of 80f4ecc64751d5cf13a7233aa520209fee4757c8 from master
 2019-02-06 14:56:16 -05:00
Tim Graham
8eb913eabf [2.2.x] Simplified and corrected LOGIN_URL, LOGIN_REDIRECT_URL, and LOGOUT_REDIRECT_URL docs. 
Backport of b709d701303b3877387020c1558a590713b09853 from master.
 2019-02-05 20:19:32 -05:00
Tim Graham
5911d25916 [2.2.x] Removed django.utils.lru_cache usage. 
Backport of 0367bc6d04ca6d1a4a21a69a839f6d404508f8df from master.
 2019-02-04 20:33:20 -05:00
Daniel Hahler
0838cc0139 [2.2.x] Fixed duplicate word in docs/releases/2.0.txt. 
Backport of fdc4518fe296c169cf54f23fdad2e0fc8785c059 from master.
 2019-02-04 18:30:29 -05:00
Tim Graham
d5b43d7226 [2.2.x] Refs #30055 -- Bumped minimum SQLite version in GIS docs. 
Backport of 4763c9719135f4de17924d9c8524f1cfe41bc645 from master.
 2019-02-04 11:47:15 -05:00
Tim Graham
6b3940b5a4 [2.2.x] Used extlinks for GitHub commits. 
Backport of c34c6d0a2fc6d9bc55fb2db94b9ed40141babb15 from master.
 2019-02-01 15:49:31 -05:00
Daniel Roseman
a3ce94e96e [2.2.x] Used LoginRequiredMixin in "Models and request.user" example. 
Backport of 6da28d5edfaee1858c8f7ae603a717aaa05e15cf from master.
 2019-01-31 18:02:13 -05:00
Robert Coup
953067d8dc [2.2.x] Refs #28161 -- Doc'd INSTALLED_APPS requirement for ArrayField(CIText). 
Backport of a8b03bea180e0660c0e159f3e7cf6192b512925f from master
 2019-01-31 13:42:29 -05:00
Sergey Fedoseev
6187519236 [2.2.x] Corrected output of Prefetch.to_attr example. 
Backport of ba7a420012799b26ec9e969d0276d2ccee93c1f5 from master.
 2019-01-31 09:09:34 -05:00
Carlton Gibson
89d39dc1d7 [2.2.x] Fixed #30091 -- Doc'd middleware ordering requirements with CSRF_USE_SESSIONS. 
Backport of bae66e759faee8513da4b11d3fd16b044b415bdb from master.
 2019-01-30 13:12:43 -05:00
Mariusz Felisiak
6e8b11ab2b
[2.2.x] Fixed E117 and F405 flake8 warnings. 
Backport of 5a5c77d55dc85c7e6cf910243257e408887f412a from master
 2019-01-30 13:08:19 +01:00
Daniel Hahler
2789cc633f [2.2.x] Fixed typo in docs/releases/2.2.txt. 
Backport of 14581553e4ce9918aeb427fee7e5d7b6681e4e85 from master
 2019-01-29 09:10:53 -05:00
Claude Paroz
caaa01142d [2.2.x] Fixed #29825 -- Fixed JS ngettext if the string is a non-plural msgid in the catalog. 
Backport of 16454ac35f6a24a04b23a9340b0d62c33edbc1ea from master.
 2019-01-28 18:17:52 -05:00
Tom Forbes
728358c5cf [2.2.x] Fixed #25624 -- Fixed autoreload crash with jinja2.ModuleLoader. 
Backport of 1e92407f83ed35be35f876777935b983ab9587be from master.
 2019-01-28 14:42:46 -05:00
Paveł Tyślacki
2ca200a7c3 [2.2.x] Made test table cleanup in OperationTestBase more robust. 
Some non-unique constraint names were added in
b69f8eb04cc8762d3dfd5af5ea1fc58e3f2ebcc3 which resulted in failures
depending on the order in which tests were run.

Backport of 62b8596616ea46849e29ca77a77e1196417dc1f9 from master.
 2019-01-28 13:48:04 -05:00