mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-13 10:50:55 +00:00
Code Issues 32 Releases Wiki Activity
15,659 Commits 29 Branches 437 Tags
Commit Graph

1889 Commits

Author SHA1 Message Date
Moayad Mardini
2b0e9aa57d [1.6.x] Fixed #22493 - Added warnings to raw() and extra() docs about SQL injection 
Thanks Erik Romijn for the suggestion.

Backport of 3776926cfe503f16c7195621da20c5b89bda70a2 from master
 2014-04-25 09:56:39 -04:00
Malcolm Box
42659ceb3f [1.6.x] Fixed #22516 -- Added versionchanged annotation for STATIC_ROOT default value. 
Backport of 658710be00 from stable/1.7.x
 2014-04-25 09:36:56 -04:00
Marti Raudsepp
c5306d4af1 [1.6.x] Various documentation typo/spelling fixes 
Errors detected by Topy (https://github.com/intgr/topy), all changes
verified by hand.

Backport of 11d453bcadad3c9a5ae35882792d0f1e8e8e7818 from master
 2014-04-22 20:13:43 -04:00
Erik Romijn
5f0829a27e [1.6.x] Fixed queries that may return unexpected results on MySQL due to typecasting. 
This is a security fix. Disclosure will follow shortly.

Backport of 75c0d4ea3ae48970f788c482ee0bd6b29a7f1307 from master
 2014-04-21 18:30:27 -04:00
Matt Lauber
25adac9b42 [1.6.x] Corrected the section identifier for MySQL unicode reference. 
Backport of b2514c02e1 from master
 2014-04-21 13:20:51 -04:00
Tim Graham
1b43131b5d [1.6.x] Moved RemoteUserBackend documentation to reference guide. 
Backport of 26d118c3fe from master
 2014-04-18 16:11:10 -04:00
Moayad Mardini
b6863879e1 [1.6.x] Fixed #22458 -- Added a note about MySQL utf8_unicode_ci collation 
Thanks tobami at gmail.com for the report.

Backport of 11ac50b18e from master
 2014-04-18 15:11:14 -04:00
Tim Graham
839deb7a77 [1.6.x] Fixed #22473 -- Emphasized that Model.clean() is not called from Model.save(). 
Backport of b43bbd6d39 from master
 2014-04-18 15:03:30 -04:00
Ben Davis
e093060823 [1.6.x] Fixed #22220 -- Added more examples to reverse() documention. 
Thanks EvilDMP for the suggestions.

Backport of 030dd4f72c from master
 2014-04-16 20:31:09 -04:00
Tim Graham
a476b15aa5 [1.6.x] Added RemoteUserMiddleware to middleware reference page. 
Backport of 465980d070a33555cdabb4787db50a4e23228de2 from master.
 2014-04-16 07:30:50 -04:00
Tim Graham
de95867284 [1.6.x] Fixed #21353 -- Noted that description is ignored for TabularInlines. 
Thanks nofinator for the report.

Backport of d5031ecf88 from master
 2014-04-10 13:33:34 -04:00
Shai Berger
d5cef2a19c [1.6.x] Documentation fixes for the select_for_update change. 
Refs #22343; thanks Tim Graham for the fixes.
 2014-04-10 03:44:45 +03:00
Shai Berger
690a5984a3 [1.6.x] Fixed #22343 -- Disallowed select_for_update in autocommit mode 
The ticket was originally about two failing tests, which are
fixed by putting their queries in transactions.

Thanks Tim Graham for the report, Aymeric Augustin for the fix,
and Simon Charette, Tim Graham & Loïc Bistuer for review.

Backport of b990df1d63 from master
 2014-04-10 02:15:14 +03:00
ejstronge
32529e6432 [1.6.x] Fixed small typo in django-admin.txt 
The word 'by' seemed to be missing from the first line of the compilemessages command.

Backport of 5ca522b9ed from master
 2014-04-09 07:13:45 -04:00
Vishal Lal
1cce00a762 [1.6.x] Fixed #22372 -- Improved description of WizardView.get_context_data(). 
Thanks simon29 for the report.

Backport of a8e2ec0e82 from master
 2014-04-03 08:28:02 -04:00
Tim Graham
f0d03d41be [1.6.x] Replaced urllib/urlparse imports with from django.utils.six.moves. 
Backport of 981b864fbd from master
 2014-03-31 07:55:33 -04:00
Tim Martin
fe83cfe9ed [1.6.x] Fixed #21941 -- Documented the kwargs param of django.conf.urls.url(). 
Thanks cjerdonek for the report.

Backport of a779757706 from master
 2014-03-27 07:02:06 -04:00
Tim Graham
c0a9c2f72a [1.6.x] Fixed #22322 -- Fixed incorrect explanation of what managed=False does. 
refs #14305.

Thanks Adrian Klaver for the report.

Backport of 9b7ba8af1b4ddb539cd69cbec9645cd873db7624 from master
 2014-03-25 14:10:29 -04:00
Adam Kaliński
38096da5c0 [1.6.x] Fixed #22048 - Enhanced docs to cover nonexistent one-to-one relationships. 
Thanks EvilDMP for the suggestion.

Backport of ec08d62a20 from master
 2014-03-24 09:45:56 -04:00
Claude Paroz
d908b67e81 [1.6.x] Fixed #22317 -- Fixed documented handler400 default value 
Backport of 3f7615cddc from master.
 2014-03-23 21:20:43 +01:00
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
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
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
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 ea4da8e63c314b4f7cbcb4dd06eef466c1e872ed from master.
 2014-03-02 17:21:10 +01: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
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 462edd22e5577ff9ee6477f7572b571700d1a2aa from master.
 2014-02-23 13:58:08 +01:00
Marcin Sokół
98070b94a9 [1.6.x] Fixed #21902 -- Documented search order for list_display. 
Backport of 09b725f51bbfa0f01b27ee2d718889926d409519 from master.
 2014-02-23 13:54:56 +01:00
Jochem Oosterveen
882f2a5b81 [1.6.x] Fixed #22092 -- Documented ResolverMatch.view_name 
Backport of 271929dd9d3aa5184cbb13d79b3651ac32e640ea 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 b8874084868080baff29ac3453d20a845fd1568c 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 072fb923e1b2e39e85a4ed4569ee7cd94f26a0bb 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 b645be80e99709c8b1f9b3d1c26e99e22fdca08b from master.
 2014-02-23 13:51:42 +01: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
Baptiste Mispelon
dbb9819360 [1.6.x] Fixed inaccuracies in generic mixins documentation. 
Backport of a5391db76a20c8bb35a7bc0192870fddf747c54c from master.
 2014-02-09 11:00:25 +00: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
c91e772b3a [1.6.x] Fixed some punctuation; thanks Chris Jerdonek. 
Backport of 81830ce34f from master
 2014-01-23 09:05:09 -05:00
Baptiste Mispelon
6bf05c0267 [1.6.x] Always use parentheses when documenting a method with no arguments. 
Backport of 05d36dc06e6d767bb28993c65a54b703f319a386 from master.
 2014-01-22 23:00:06 +01:00
Baptiste Mispelon
6bca149af5 [1.6.x] Don't show self in the list of arguments of a method. 
This is consistent with Python's official documentation
and it's a sphinx recommendation too[1].

[1] http://sphinx-doc.org/markup/desc.html#dir-method

Refs #21855.

Backport of 79e1d6ebd70898d514a44b85648e3d24104c4243 from master.
 2014-01-22 22:59:55 +01:00
Tim Graham
a4c32d70c2 [1.6.x] Fixed #21529 -- Noted that {% url %} encodes its output (refs #13260). 
Backport of dfc092622e from master
 2014-01-22 10:45:10 -05:00
Tim Graham
85149a8b7f [1.6.x] Fixed #18942 -- Clarified usage of {% get_static_prefix %}. 
Thanks Aymeric for the suggestion.

Backport of bc7668eb51 from master
 2014-01-17 16:06:54 -05:00
Tim Graham
4f058655d0 [1.6.x] Fixed #13116 -- Described scope of variables created by {% url ... as var %} syntax. 
Thanks leif_p for the suggestion.

Backport of 4a5aac47a6 from master
 2014-01-17 14:52:02 -05:00
Tim Graham
b1cc1633e0 [1.6.x] Fixed #18285 -- Documented that bulk_create doesn't work with M2M relationships. 
Backport of 9173d2cb74 from master
 2014-01-16 20:49:06 -05:00
Tim Graham
363b8c690a [1.6.x] Fixed #21768 -- Corrected TemplateView context section. 
Thanks nedbatchelder for the report and claudep for the patch.

Backport of c05b2f58e7 from master
 2014-01-16 07:59:15 -05:00
Kevin Wood
deefdc8e60 [1.6.x] Fixed typo in storage docs 
Backport of 82f466b571 from master
 2014-01-15 18:44:47 -05:00
Vajrasky Kok
0a4e36c68f [1.6.x] Fixed #21319 -- Added documentation for the Form.fields attribute. 
Thanks pydanny for the report. Also, added documentation about
base_fields attribute and its difference with fields attribute.

Backport of ea83102d0f from master
 2014-01-02 19:45:22 -05:00
Nathan Smith
8b1de986f6 [1.6.x] Fixed minor typos. 
Backport of 44d40ba521 from master
 2014-01-02 16:22:21 -05:00
Loic Bistuer
3fd16e6261 [1.6.x] Fixed #21581 -- Fixed a number of issues with collectstatic. 
When STATIC_ROOT wasn't set, collectstatic --clear would delete
every files within the current directory and its descendants.

This patch makes the following changes:

Prevent collectstatic from running if STATIC_ROOT isn't set.

Fixed an issue that prevented collectstatic from displaying the
destination directory.

Changed the warning header to notify when the command is run
in dry-run mode.

Backport of 4befb3015c from master
 2013-12-31 15:04:22 -05:00
Tim Graham
51d6a7d53e [1.6.x] Fixed #21710 -- Documented User.get_short_name() 
Thanks Keryn Knight for the report.

Backport of 0150830687 from master
 2013-12-30 17:46:16 -05:00