p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,572 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

5945 Commits

Author SHA1 Message Date
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
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
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 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
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
Aymeric Augustin a0a6112afc [1.6.x] Fixed typo. Refs #21836. 
Backport of 8e1fc03 from master
 2014-01-26 09:30:27 +01:00
Chris Jerdonek a21fc1c086 [1.6.x] Fixed #21836 -- Improved transaction docs about autocommit mode 
Clarified that queries in autocommit mode are committed immediately
only if a transaction has not already been started. Added to the
main transaction docs that Django's TestCase class implicitly wraps
its tests in transactions.

Backport of 798fd59f from master.
 2014-01-25 21:21:30 +01:00
Tim Graham e2e4de6555 [1.6.x] Fixed #21869 -- Fixed docs building with Sphinx 1.2.1. 
Thanks tragiclifestories for the report.

Backport of e1d18b9d2e from master
 2014-01-24 09:05:49 -05:00
James Turley 6ea5f9e0de [1.6.x] Fixed #21824 -- Added reference to LTS in docs/internals/security.txt 
Backport of 4d8209431d from master
 2014-01-24 08:14:41 -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 05d36dc06e 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 79e1d6ebd7 from master.
 2014-01-22 22:59:55 +01:00
Tim Graham 8eca53f0be [1.6.x] Fixed #20834 -- Described how caching of user permissions works. 
Thanks Giggaflop and Jennifer Casavantes.

Backport of 5f9790072d from master
 2014-01-22 13:09:44 -05:00
Tim Graham 4cf556db48 [1.6.x] Added a link to the 1.6 release notes which also fixed a rendering issue. 
Backport of 2171341162 from master
 2014-01-22 11:04:31 -05: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 f7c2852f30 [1.6.x] Fixed #21726 -- Clarified that password should not be included in REQUIRED_FIELDS. 
Thanks russellm for the report.

Backport of 6f06c749b7 from master
 2014-01-22 10:19:02 -05:00
Tim Graham a292ad1105 [1.6.x] Fixed #21834 -- Clarifed usage of template_name in tutorial part 4. 
refs #21195 on master.
 2014-01-20 20:06:08 -05:00
Jacob Kaplan-Moss fcc290eda9 [1.6.x] Added a note about LTS releases. 
Backport of a44cbca2a5 from master.
 2014-01-19 18:43:20 +01: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 b8ec3b6ddd [1.6.x] Fixed #20052 -- Discouraged use of Jython given the current state of django-jython. 
Thanks Josh Juneau (maintainer of django-jython) for the review.

Backport of a67e327db5 from master
 2014-01-17 09:28:21 -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
Tim Graham b63dad3f45 [1.6.x] Fixed #21727 -- Added some links to help clarify topics/auth/default.txt 
Thanks daGrevis for the suggestion.

Backport of d35f2bfd5b from master
 2014-01-16 07:17:42 -05:00
Tim Graham f8d93f2c71 [1.6.x] Fixed #21747 -- Added {% elif %} to template topics guide. 
Thanks gcc for the suggestion.

Backport of 9e5033b302 from master
 2014-01-16 07:09: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
Claude Paroz 5d99cd6877 [1.6.x] Fixed #21730 -- Removed superfluous db_index in custom auth docs 
Thanks rafalp for the report.
Backport of c717ebbfec from master.
 2014-01-04 16:13:21 +01:00
Tim Graham 2206321ff9 [1.6.x] Fixed a sentence in the session security docs; thanks claudep. 
Backport of 4d27d311f6 from master
 2014-01-03 12:04:18 -05:00
Tianyi Wang 7a4d2b8e3d [1.6.x] Fixed #21728 -- Corrected an inadvertent path change in docs/intro/contributing.txt. 
Backport of e6800ea136 from master
 2014-01-03 12:01:52 -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
Tim Graham 8841cbbe82 [1.6.x] Fixed #21722 -- Added a warning for avoiding XSS vulnerabilities when reusing built-in filters. 
Thanks Stephen McDonald for the suggestion.

Backport of 07711e9997 from master
 2014-01-02 16:36:50 -05:00
Frank Tobia 5dcb287060 [1.6.x] Fixed typos. Changed grammar. 
Backport of 6dd8631617 from master
 2014-01-02 16:25:51 -05:00
Nathan Smith 8b1de986f6 [1.6.x] Fixed minor typos. 
Backport of 44d40ba521 from master
 2014-01-02 16:22:21 -05:00
Matt Robenolt ea82e98f8c [1.6.x] Django sees more than 1mm hits per hour 
Disqus regularly does 40-50k/s

Backport of a502bbb2f0 from master
 2013-12-31 19:42:45 -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 a228545026 [1.6.x] Fixed #21484 -- Documented that SQL logging does not include "framework level" queries. 
Backport of 4d8d76e7a8 from master
 2013-12-31 13:03:25 -05:00
Tim Graham a05ca51c08 [1.6.x] Fixed #19395 -- Added a simple example logging config. 
Thanks ken.nelson at maclaren.com.

Backport of 69f0249d7b from master
 2013-12-31 10:23:11 -05:00