mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
15,590 Commits 30 Branches 460 Tags
d1503afd66ca8f2f8d3819ba8a60727e0ee66cec
Commit Graph

15590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claude Paroz
d1503afd66 [1.6.x] Improved strip_tags and clarified documentation 
The fact that strip_tags cannot guarantee to really strip all
non-safe HTML content was not clear enough. Also see:
https://www.djangoproject.com/weblog/2014/mar/22/strip-tags-advisory/
Backport of 6ca6c36f8 from master.
 2014-03-22 11:07:27 +01:00
Aymeric Augustin
c8c2d60614 [1.6.x] Small doc changes missed in 66076268. 
Partial backport of 253e8ac2 from master.
 2014-03-21 22:11:50 +01:00
Tim Graham
0726482c9d [1.6.x] Replaced an instance of PIL with Pillow in the docs. 
Backport of 563d6a6bba from stable/1.7.x
 2014-03-21 11:25:18 -04:00
Anubhav Joshi
a01daaf231 [1.6.x] Fixed #22253 -- Added django-i18n to the mailing lists docs. 
Thanks bmispelon for the suggestion.

Backport of 0399523cf1 from master
 2014-03-19 07:23:41 -04:00
Daniel Pyrathon
9f7bd83184 [1.6.x] Fixed #22242 -- Documented common cookie size limit. 
Backport of 885e7adf56 from master
 2014-03-16 10:47:08 -04:00
Claude Paroz
1a2939bc26 [1.6.x] Fixed #22245 -- Avoided widget overwrite in forms.IntegerField subclasses 
Thanks Jeroen Pulles for the report and Simon Charette for the review.
Backport of 5a976b4bec from master.
 2014-03-13 16:59:23 +01:00
Dejan Noveski
141bb90b4c [1.6.x] Fixed #22262 -- Added the correct line in the last example of Translator lines 
Backport of 958b511a80 from master.
 2014-03-13 14:14:40 +01:00
Tim Graham
f582b61f1c [1.6.x] Fixed typo in docs/ref/django-admin.txt 
Thanks Wes Kendall for the report.

Backport of ce3d9f847d from master
 2014-03-11 08:10:40 -04:00
Alex de Landgraaf
8e704b176f [1.6.x] Fixed #21986 -- Added some guidelines for database indexes. 
Thanks django-issues at colons.co for the suggestion.

Backport of c8d61fa109 from master
 2014-03-03 11:19:03 -05:00
Tim Graham
e7649789ed [1.6.x] Fixed #21908 -- Added example usage for ModelAdmin.get_inline_instances(). 
Thanks matt at schinckel.net for the suggestion.

Backport of 5a4f1298cf from master
 2014-03-03 10:42:32 -05:00
Baptiste Mispelon
4aaea2921d [1.6.x] Fixed some typos in the documentation. 
Thanks to Rodolfo Carvalho and Piotr Kasprzyk
for the patch.

Partial backport of ea4da8e63c from master.
 2014-03-02 17:21:10 +01:00
Alexey Voronov
5cda1d2702 [1.6.x] Fixed #21643 -- repeated execution of qs with F() + timedelta 
Thanks Tim Graham for review and Tai Lee for the additional test to prove
this was a regression in 1.6.

Backport of 7f2485b4d1 and 8137215973 from master
 2014-02-28 20:49:13 -05:00
navneet suman
f2b513c9e8 [1.6.x] Fixed #22145 -- Clarified docs on Field.blank and Field.null options. 
Thanks skipjack at peru.com for the suggestion.

Backport of 3390550f6f from master
 2014-02-25 21:01:02 -05:00
Rik
dde67de0f6 [1.6.x] Fixed #12670 -- Added a note about permissions of files stored in FILE_UPLOAD_TEMP_DIR. 
Thanks simon29 for the suggestion.

Backport of 355572ac56 from master
 2014-02-25 11:21:29 -05:00
Henk Vos
985d0865a3 [1.6.x] Fixed #22071 -- Added a warning regarding override_settings and aliasing. 
Thanks EvilDMP for the suggestion.

Backport of e65c0ccac0 from master
 2014-02-25 10:48:51 -05:00
Claude Paroz
3a5da7a11c [1.6.x] Fixed #22116 -- Added precision about WSGIPythonPath separator 
Thanks donjpacheco for the initial patch.
Backport of 91f4a75a6b from master.
 2014-02-24 18:29:46 +01:00
Alasdair Nicol
39b099bdd2 [1.6.x] Fixed #22112 -- Added RedirectView.pattern_name to CBV flattened index 
Also moved accessor method get_redirect_url next to its attribute url
for consistency with the other views.

Thanks nikunj.sg for the report

Backport of 462edd22e5 from master.
 2014-02-23 13:58:08 +01:00
Martin Matusiak
4f6ff7ee85 [1.6.x] Fixed #22007 -- Fixed cbv docs - make imports consistent 
Thanks to trac user kinjal.dixit for the report.

Backport of d399731bf2 from master.
 2014-02-23 13:56:04 +01:00
Marcin Sokół
98070b94a9 [1.6.x] Fixed #21902 -- Documented search order for list_display. 
Backport of 09b725f51b from master.
 2014-02-23 13:54:56 +01:00
Jochem Oosterveen
882f2a5b81 [1.6.x] Fixed #22092 -- Documented ResolverMatch.view_name 
Backport of 271929dd9d from master.
 2014-02-23 13:54:17 +01:00
Marcin Sokół
79cc1fa58d [1.6.x] Fixed #22113 -- changed object_name to model_name in CBV docs. 
Thanks to trac user nikunj.sg for the report.

Backport of b887408486 from master.
 2014-02-23 13:52:45 +01:00
Baptiste Mispelon
a36513c2b4 [1.6.x] Fixed #21881 -- Clarify behavior of {% ssi %} template tag. 
When using the `parsed` option, {% ssi %} has the same limitation
as {% include %}, namely that the rendering of the included
template is done separately.

Thanks to trac user nagyv for the report and to alextreme for
the patch.

Backport of 072fb923e1 from master.
 2014-02-23 13:52:14 +01:00
Alex de Landgraaf
23cbfc9a25 [1.6.x] Fixed #22063 -- Added reference to NoReverseMatch from the reverse() documentation 
Backport of b645be80e9 from master.
 2014-02-23 13:51:42 +01:00
Baptiste Mispelon
12da6902e9 [1.6.x] Fixed #22107 -- Fixed django.core.files.File object iteration. 
Due to a mixup between text and bytes, iteration over
a File instance was broken under Python 3.

Thanks to trac user pdewacht for the report and patch.

Backport of 3841feee86 from master.
 2014-02-20 23:59:51 +01:00
Tim Graham
e56ce87bd8 [1.6.x] Fixed #22093 -- Made Form.Meta.fields examples consistent. 
Thanks david-schultz at gmx.net for the suggestion.

Backport of 821fc925f0 from master
 2014-02-19 12:33:32 -05:00
Tim Graham
a088ce90f2 [1.6.x] Fixed #22062 -- Corrected static files config for Apache >= 2.4 
Backport of ffa238c3f7 from master
 2014-02-18 09:32:41 -05:00
Zbigniew Siciarz
14366ed33e [1.6.x] Fixed #22013 -- Documented difference between SERVER_EMAIL and DEFAULT_FROM_EMAIL. 
Backport of 44814e78cc from master
 2014-02-15 13:30:13 -05:00
Tim Graham
a6f05af016 [1.6.x] Added 1.6.3 release note for refs #21566. 
Backport of 865392c478 from master
 2014-02-14 21:06:08 -05:00
Roger Hu
9a446211bd [1.6.x] Fixed #21566 -- Fixed AttributeError when using bulk_create with ForeignObject. 
Backport of bbc73e6a12 from master.
 2014-02-14 20:57:32 -05:00
Tim Graham
32a880ae95 [1.6.x] Added a missing import in staticfiles tests. 2014-02-13 08:03:43 -05:00
Loic Bistuer
d6db48e5f6 [1.6.x] Reworked the detection of local storages for the collectstatic command. 
Before 4befb30 the detection was broken because we used isinstance
against a LazyObject rather than against a Storage class. That commit
fixed it by looking directly at the object wrapped by LazyObject.
This could however be a problem to anyone who subclasses the
collectstatic management Command and directly supplies a Storage class.

Refs #21581.

Backport of 7e27885c6e from master.
 2014-02-12 11:05:07 -05:00
Claude Paroz
76700c5437 [1.6.x] Fixed #21996 -- Used proper encoding for GeoIP content 
Thanks Florent Messa for the report.
Backport of fb1e3435a4 from master.
 2014-02-10 16:12:22 +01:00
Claude Paroz
e9ffe7e3c8 [1.6.x] Added 1.6.3 release notes stub 2014-02-10 16:10:18 +01:00
Baptiste Mispelon
dbb9819360 [1.6.x] Fixed inaccuracies in generic mixins documentation. 
Backport of a5391db76a from master.
 2014-02-09 11:00:25 +00:00
Jacob Kaplan-Moss
63d6983746 Bumped version number post-release. 2014-02-06 15:53:09 -06:00
Jacob Kaplan-Moss
687b3d96c4 Bump version number for 1.6.2. 1.6.2 2014-02-06 15:38:06 -06:00
Jacob Kaplan-Moss
c58a98cc34 Updated 1.6.2 release notes for release (and linkified tickets). 2014-02-06 15:34:41 -06:00
Tim Graham
5f03b06919 [1.6.x] Added missing items to 1.6.2 release notes. 
Backport of b17c75564f from master
 2014-02-05 19:30:30 -05:00
Baptiste Mispelon
a77ec25573 [1.6.x] Added previous commit to 1.6.2 release notes. 
Backport of 2dd88f0687 from master.
 2014-02-05 21:46:24 +01:00
Baptiste Mispelon
8864d24789 [1.6.x] Revert "Fixed #20296 -- Allowed SafeData and EscapeData to be lazy" 
This reverts commit 2ee447fb5f.

That commit introduced a regression (#21882) and didn't really
do what it was supposed to: while it did delay the evaluation
of lazy objects passed to mark_safe(), they weren't actually
marked as such so they could end up being escaped twice.

Refs #21882.

Backport of a878bf9b09 from master.
 2014-02-05 21:32:17 +01:00
Anssi Kääriäinen
fd3fa851b5 [1.6.x] Fixed #21748 -- join promotion for negated AND conditions 
Made sure Django treats case .filter(NOT (a AND b)) the same way as
.filter((NOT a OR NOT b)) for join promotion.

Heavily modified backpatch of 35cecb1ebd
from master.

Conflicts:

	django/db/models/sql/query.py
	tests/queries/tests.py
 2014-02-04 19:06:37 +02:00
Anssi Kääriäinen
0f272629ca [1.6.x] Fixed #21413 -- resolve_columns fields misalignment 
Backpatch of 9918c11114 from master.

Conflicts:

	django/db/models/sql/compiler.py
	tests/model_inheritance_regress/tests.py
 2014-02-04 15:21:13 +02:00
Shai Berger
5f42c02195 [1.6.x] Made Oracle introspect FloatFields correctly 
Broke InspectDBTestCase.test_field_types in two:
- a test_number_field_types, which now passes on Oracle too
- a test_field_types, for all non-numeric fields, which is still expected to fail

Also made some pep8 fixes in the tests file. Refs #19884

Thanks Tim Graham for review.

Backport of e9d12ba from master
 2014-01-30 01:26:42 +02:00
Shai Berger
0573120cb4 [1.6.x] Made Oracle introspect boolean fields 
Refs #19884

Backport of ad975c64fc from master
 2014-01-30 01:04:19 +02:00
Ian Foote
05cef1939e [1.6.x] Fix typo CRSF -> CSRF 
Backport of af64f829d7 from master
 2014-01-29 12:08:42 -05:00
Tim Graham
6f8e655ca0 [1.6.x] Added release note stubs for 1.5.6 and 1.4.11. 
Backport of dfa28981ce from master
 2014-01-26 17:49:01 -05:00
Tim Graham
38635977b7 [1.6.x] Added missing items to 1.6.2 release notes. 
Backport of 2cbe1e28fb from master
 2014-01-26 15:40:44 -05:00
Tim Graham
319cfd2097 [1.6.x] Fixed #21823 -- Upgraded six to 1.5.2 
Backport of 780ae7e9f8 from master.
 2014-01-26 15:38:01 -05:00
Aymeric Augustin
db60a52085 [1.6.x] Fixed #21880 -- Added missing items to django.utils.timezone.__all__. 
Thanks Wim for the report.

Backport of 2b154ae from master.
 2014-01-26 15:36:55 +01:00
Aymeric Augustin
a0a6112afc [1.6.x] Fixed typo. Refs #21836. 
Backport of 8e1fc03 from master
 2014-01-26 09:30:27 +01:00