mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-05 14:06:42 +00:00
Code Issues 32 Releases Wiki Activity
24,959 Commits 29 Branches 441 Tags
Commit Graph

24959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom
73d025a042 [2.0.x] Refs #28440 -- Fixed server connection closing test on macOS. 
Backport of 32ade78c55edd6231544607a841a9e7efdcbdb5b from master
 2017-10-13 13:46:21 -04:00
Mariusz Felisiak
8b42a18b2d
[2.0.x] Refs #28643 -- Reorganized database functions docs. 
Thanks Tim Graham for the review.

Backport of ad8036d715d4447b95d485332511b4edb1a40c0e from master
 2017-10-13 18:38:50 +02:00
LeeHanYeong
edd3601be6 [2.0.x] Removed incorrect reference to ModelChoiceField in Field.choices docs. 
Backport of 3ffbd54566f51e4ac3d90fc6be8b3ab56fc89b75 from master
 2017-10-13 11:10:51 -04:00
Paulo
5d3f2aa3f1 [2.0.x] Fixed #27846 -- Made Model.refresh_from_db() clear cached relations. 
Backport of a7b5ad8b19a08d7d57302ece74f6e26d2887fd9f from master
 2017-10-12 17:29:53 -04:00
François Freitag
51998a2988 [2.0.x] Fixed #28679 -- Fixed urlencode()'s handling of bytes. 
Regression in fee42fd99ee470528858c2ccb3621135c30ec262.

Thanks Claude Paroz, Jon Dufresne, and Tim Graham for the guidance.

Backport of 41be85862d9067a809ccf3707d2a22dfef23d99a from master
 2017-10-12 09:36:07 -04:00
François Freitag
2a55063dcc [2.0.x] Split django.utils.http tests into separate test classes. 
Backport of 0e212a705e6b2e49a246b16286036c40ec2ac4f8 from master
 2017-10-11 09:45:45 -04:00
Daniel Tao
dc112bf530 [2.0.x] Fixed #28601 -- Prevented cache.get_or_set() from caching None if default is a callable that returns None. 
Backport of 4d60261b2a77460b4c127c3d832518b95e11a0ac from master
 2017-10-10 09:35:52 -04:00
Mads Jensen
d3e115151e [2.0.x] Fixed #28423 -- Expanded docs for indexing contrib.postgres fields. 
Backport of 22ff4f81b1859ed7af7999ef479a10b5d31a2164 from master
 2017-10-09 12:19:38 -04:00
Tim Graham
22bcb89917 [2.0.x] Moved link in "Features removed in 2.0" to be more specific. 
Backport of 50de55f39984e0b83ba760192b1ecd10e5737c3d from master
 2017-10-09 09:42:00 -04:00
Johannes Hoppe
5825212440 [2.0.x] Fixed #28685 -- Fixed awkward wrapping of Select2 chips. 
Backport of 3a191bd4abf9937e11504e66a7e5167910c0ab84 from master
 2017-10-09 09:00:39 -04:00
François Freitag
3eb447d85b [2.0.x] Refs #23919 -- Corrected django.utils.http.urlencode()'s documented signature. 
Follow up to fee42fd99ee470528858c2ccb3621135c30ec262.

Backport of e3a30f2d16d65e7f0b870e997e92425a2f795587 from master
 2017-10-09 08:55:06 -04:00
Mariusz Felisiak
71da2b4f11 [2.0.x] Refs #24254 -- Removed unnecessary SQL AS clause in SQLCompiler.as_sql(). 
Incorrect on Oracle.

Backport of 11ade8eefd32f5bc7ee6379b77824f02ca61c20b from master
 2017-10-06 13:18:56 -04:00
Tim Graham
ef5d86555d [2.0.x] Added stub release notes for 1.11.7. 
Backport of fd4698fe3f2a1cfe9deef83a95db725e5cb66f21 from master
 2017-10-05 14:45:20 -04:00
Tim Graham
3b75af63ae [2.0.x] Added release date for 1.11.6. 
Backport of a8bcb8b509629bc843c4da231955d8c5ef786edd from master
 2017-10-05 14:14:25 -04:00
Mariusz Felisiak
20d6785426 [2.0.x] Fixed #28596 -- Fixed QuerySet.bulk_create() and cascade deletion crash on Oracle when using more than 65535 parameters. 
Thanks Tim Graham for the review.
Backport of 1b823b8f182e8f31b8c9db281311ef718299eda7 from master
 2017-10-05 18:54:45 +02:00
Tim Graham
cfde4ac3e7 [2.0.x] Refs #28677 -- Doc'd that on_delete is required in migrations. 
Backport of 491eb56fd4dea10248ccced90c31ed64152d09cb from master
 2017-10-03 09:46:50 -04:00
Jon Dufresne
5091bb6a07 [2.0.x] Refs #27025, #28593 -- Fixed "invalid escape sequence" warnings in urls/resolvers.py. 
Backport of f0ffa3f4ea277f9814285085fde20baff60fc386 from master
 2017-09-30 20:33:18 -04:00
Tim Graham
d6cec5f6ff [2.0.x] Fixed #27979 -- Made MySQL raise IntegrityError rather than OperationalError when saving negative numbers in PositiveInteger fields. 
Backport of dd82f3327124fd2762cf6df2ac8c6380772bf127 from master
 2017-09-29 18:33:10 -04:00
Stefan Schneider
eff5f837c9 [2.0.x] Fixed #28653 -- Added missing ForeignKey.on_delete argument in docs. 
Backport of 08c8c3ead97893ec0e1dece699525ad7ed27c2d7 from master
 2017-09-29 11:38:41 -04:00
Stefan Schneider
9f9a8a6c59 [2.0.x] Fixed #28648 -- Corrected typo in docs/topics/db/queries.txt. 
Backport of 293df73fb67a56c0417af8c39f808f64bc03cbeb from master
 2017-09-29 10:32:07 -04:00
Michael Käufl
acd870a75a [2.0.x] Fixed #28651 -- Fixed typo in docs/ref/contrib/postgres/fields.txt. 
Backport of 259fec8de0814ba1277774b030bc6e3f99e40268 from master
 2017-09-29 09:27:35 -04:00
Simon Charette
deb3b58b36 [2.0.x] Refs #28492 -- Defined aggregates' output_field at the class level. 
Missed in 08654a99bbdd09049d682ae57cc94241534b29f0.

Backport of f1b713024e3a1e8c6361ea407cb8248224f7cc82 from master
 2017-09-29 08:20:08 -04:00
Mariusz Felisiak
8368d5a400 [2.0.x] Fixed #28629 -- Made tree.Node instances hashable. 
Regression in 508b5debfb16843a8443ebac82c1fb91f15da687 which
added Node.__eq__().

Backport of fc6528b25ab1834be1a478b405bf8f7ec5cf860c from master
 2017-09-28 12:07:36 -04:00
Jon Ribbens
aff2df2427 [2.0.x] Fixed #28625 -- Distinguished DATABASES['TIME_ZONE'] from settings.TIME_ZONE. 
Backport of 44f08422c872e32854216b2b30aab119ec3bb5d8 from master
 2017-09-28 10:17:46 -04:00
Josh Schneier
7c6590af5f [2.0.x] Fixed #28562 -- Fixed DecimalValidator handling of positive exponent scientific notation. 
Backport of e8c45963296eb8bf3938bf9ece30b585a8cbb097 from master
 2017-09-27 09:42:20 -04:00
Miguel
5b38d7e973 [2.0.x] Clarified StrIndex docs example. 
Backport of 4a908c0cd23fa4da621938203ee2d910b179dbf8 from master
 2017-09-27 09:28:35 -04:00
Christopher Schäpers
ecea60fee8 [2.0.x] Fixed #28627 -- Added slug converter to some path() examples in docs. 
Backport of 6da140724dba546d2f3aced1308e617747b0385c from master
 2017-09-25 13:11:07 -04:00
Mariusz Felisiak
c67dce911e [2.0.x] Merged startswith() calls. 
Backport of 00709d704ee75ace99c4a81aa60e029caeeac387 from master
 2017-09-25 09:18:44 -04:00
Tim Graham
e241b4e797 [2.0.x] Reverted "Fixed #28248 -- Fixed password reset tokens being valid for 1 day longer than PASSWORD_RESET_TIMEOUT_DAYS." 
This reverts commit 95993a89ce6ca5f5e26b1c22b65c57dcb8c005e9.

Backport of 67a6ba391bbcf1a4c6bb0c42cb17e4fc0530f6d2 from master
 2017-09-25 09:06:32 -04:00
Claude Paroz
d68744f6ad [2.0.x] Fixed JS linter error 
Regression introduced in 1f3dfd783d.
Backport of c180abe6f1f663dcd2f1ed75590eb6aa6cb94276 from master.
 2017-09-24 18:09:23 +02:00
Claude Paroz
600104172a [2.0.x] Updated translation catalogs 2017-09-24 13:54:11 +02:00
Claude Paroz
9907f8a5fd [2.0.x] Refs #25006 -- Marked again admin time picker shortcuts for translation 
Backport of fe000ab18d2571394868882865907e92aabbda0a from master.
 2017-09-24 13:45:58 +02:00
Tim Graham
dda37675db [2.0.x] Refs #27788 -- Corrected minimum supported Oracle version in GIS docs. 
Backport of d90936f41a2d7a3361e51fc49be033ba0f05f458 from master
 2017-09-22 15:09:55 -04:00
Tim Graham
45cd53eee8 [2.0.x] Bumped trove classifier for 2.0 alpha 1. 2.0a1 2017-09-22 14:04:22 -04:00
Tim Graham
bf987b70d2 [2.0.x] Bumped version to 2.0 alpha 1. 2017-09-22 12:58:24 -04:00
Tim Graham
828d55c0d5 [2.0.x] Removed empty sections in 2.0 release notes. 
Backport of 559040f3d3552870cf010b5d10779ab30913d854 from master
 2017-09-22 12:50:22 -04:00
Tim Graham
08dfcd89f6 [2.0.x] Updated man page for Django 2.0 alpha. 2017-09-22 12:26:46 -04:00
Tim Graham
366df25778 [2.0.x] Bumped django_next_version in docs config. 2017-09-22 12:21:21 -04:00
Nicolas Delaby
01d440fa1e Fixed #27332 -- Added FilteredRelation API for conditional join (ON clause) support. 
Thanks Anssi Kääriäinen for contributing to the patch.
 2017-09-22 11:53:17 -04:00
Mariusz Felisiak
3f9d85d95c Removed unused eof argument to BoundaryIter._find_boundary(). 
Unused since its introduction in d725cc9734272f867d41f7236235c28b3931a1b2.
 2017-09-22 10:47:14 -04:00
Daniel Tao
6f7279c4b1 Refs #28593 -- Made URLResolver._populate() more resilient to signal interrupts. 
_populate() sets the populating attribute to prevent infinite recursion in
case a urlconf includes itself. The flag is a threadlocal to avoid a race
condition [1] where one thread sets the flag and another checks it, then
proceeds to access data that's supposed to be populated (e.g. _reverse_dict)
but isn't yet.

The potential still exists for a thread to set the threadlocal, then be
interrupted by a signal such as SIGALRM and raise before resetting the
threadlocal flag. In this scenario, subsequent calls to _populate() in the
same thread will short-circuit erroneously.

The bulk of the method was already wrapped in a try/finally in df41b5a, but
since a signal interrupt can occur at any line executed by the interpreter,
this moves up the try to ensure threadlocal gets reset.

[1]: https://groups.google.com/d/msg/django-developers/D_bIeinKHjE/4NmVQUJqAgAJ
 2017-09-22 10:16:05 -04:00
Anssi Kääriäinen
771e06af2a Added a test for QuerySet.select_related() reverse caching. 2017-09-21 14:25:42 -04:00
Shai Berger
d612026c37 Refs #28595 -- Added a hook to add execute wrappers for database queries. 
Thanks Adam Johnson, Carl Meyer, Anssi Kääriäinen, Mariusz Felisiak,
Michael Manfre, and Tim Graham for discussion and review.
 2017-09-21 12:13:09 -04:00
Stefan Sinca
347551c2a1 Fixed #28508 -- Set the foreground color to black in CSRF and 404 error templates. 2017-09-21 10:23:23 -04:00
Mads Jensen
41a7876991 Added test for too large input to django.utils.http.base36_to_int(). 2017-09-21 10:21:02 -04:00
Niall Dalton
4fe6588da3 Fixed #28576 -- Added color interpretation method to GDALBand. 2017-09-21 09:42:38 -04:00
Thomas Schorr
52eb5b289e Fixed #28617 -- Made ogrinspect output pep8 compliant. 2017-09-20 21:03:14 -04:00
Sjoerd Job Postmus
df41b5a05d Fixed #28593 -- Added a simplified URL routing syntax per DEP 0201. 
Thanks Aymeric Augustin for shepherding the DEP and patch review.
Thanks Marten Kenbeek and Tim Graham for contributing to the code.
Thanks Tom Christie, Shai Berger, and Tim Graham for the docs.
 2017-09-20 18:04:42 -04:00
Florian Apolloner
c4c128d67c Fixed #28488 -- Reallowed error handlers to access CSRF tokens. 
Regression in eef95ea96faef0b7dbbe0c8092202b74f68a899b.
 2017-09-20 16:22:18 -04:00
Florian Apolloner
77f82c4bf1 Initialized CsrfViewMiddleware once in csrf_tests. 2017-09-20 16:22:12 -04:00