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

6107 Commits

Author SHA1 Message Date
Ray Ashman 49f5a29493 [1.6.x] Updated grammar in description of django.contrib.auth. 
Backport of 9853779805 from master
 2014-04-22 18:29:07 -04:00
Tim Graham 362ce5e936 [1.6.x] Added 1.6.4 release note stub. 
Backport of 9fb95dfc9f from master
 2014-04-22 11:49:29 -04:00
James Bennett 7bb9bebe47 [1.6.x] Add missing disclosure information to security archive. 2014-04-21 18:29:05 -05:00
James Bennett 3f1abbfc40 [1.6.x] Update for 1.6.3 security release. 2014-04-21 18:10:57 -05:00
Erik Romijn d63bfb14dd [1.6.x] Added information on resolved security issues to release notes. 
Backport of c07f3e60c2 from master
 2014-04-21 18:30:27 -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 75c0d4ea3a 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
Tim Graham 9e28bfb324 [1.6.x] Added some missing items to the 1.6.3 release notes. 
Backport of c2b269df6e from master
 2014-04-18 10:32:53 -04:00
Erik Romijn 8e5ce99d83 [1.6.x] Fixed #22471 -- Corrected misprint in i18n docs 
Backport of 54d5c37de6 from master.
 2014-04-18 15:14:31 +02: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
Jordi Yeh 82803611eb [1.6.x] Fixed #22457 -- Fixed contributing guide w/o github set-up 
The published commnand was not working when the user did not have
the git client set-up with the public-key. Changed the contributing
guide to clone it from https instead.

Backport of 2810299117 from master.
 2014-04-16 09:42:02 -04:00
Tim Graham 20dbbc5fa2 [1.6.x] Fixed #22453 -- Corrected DoesNotExist message in docs. 
Thanks Eugenio Cano-Manuel.

Backport of eefad142de from master
 2014-04-16 08:38:04 -04:00
Tim Graham 9510e96da6 [1.6.x] Added a note regarding django.contrib.auth.authenticate. 
Thanks Josh Brown for the suggestion.

Backport of ae5b662796 from master
 2014-04-16 07:49:38 -04:00
Tim Graham a476b15aa5 [1.6.x] Added RemoteUserMiddleware to middleware reference page. 
Backport of 465980d070 from master.
 2014-04-16 07:30:50 -04:00
Tim Graham 724ccd2ec1 [1.6.x] Fixed #22392 -- Corrected deployment instructions for Apache 2.4. 
Thanks zjcheah at yahoo.com for the report.

Backport of 0f37d2e4c0 from master
 2014-04-15 17:45:52 -04:00
valtron 1252b77824 [1.6.x] Fixed #21760 -- prefetch_related used an inefficient query for reverse FK. 
Regression introduced by commit 9777442. Refs #21410.

Conflicts:
	tests/prefetch_related/tests.py

Backport of d3b71b976d from master
 2014-04-13 01:06:03 +07:00
Tim Graham d501c79f7b [1.6.x] Fixed #22419 -- Typo in docs/topics/db/multi-db.txt. 
Thanks Josh Kupershmidt.

Backport of c487b1e230 from master
 2014-04-10 19:34:25 -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
John Paulett 129cb7e222 [1.6.x] Fixed #22364 -- Sanitized getpass input in changepassword. 
Python 2 getpass on Windows does not accept unicode, even
when containing on ASCII characters. Related #190807.

Backport of b5a9166f7e from master
 2014-04-10 13:16:08 -04:00
Carl Meyer 728fd27c00 [1.6.x] Fixed #22412 -- More nuanced advice re template filters and exceptions. 
Thanks Tim for review.

Backport of 7e3834adc9 from master
 2014-04-10 06:19:15 -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
Anubhav Joshi 23526d2f48 [1.6.x] Fixed #16205 -- Added an installation for Windows. 
Backport of d35d2f61c5 from master
 2014-04-08 11:29:02 -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
Ramiro Morales bd5965ce68 [1.6.x] Document removal of GeoDjangoTestSuiteRunner in 1.6 release notes. 
e6ced2bb08 from master.
 2014-04-02 17:18:56 -03:00
Patrick Michaud 73474df954 Fixed #22256 -- Replaced bad fallback for missing PATH 
Thanks Baptiste Mispelon for the review.
Backport of acee46fc9 from master.
 2014-04-01 20:45:12 +02: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
Loic Bistuer a5297c1ef4 [1.6.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes. 
Thanks to trac username honyczek for the report. Refs #6903.

Backport of 4339e9a92d from master
 2014-03-31 07:29:08 -04:00
Tim Graham 916f0de74b [1.6.x] Added 1.6.3 release note for refs #22250. 
Backport of d57ba04d89 from master
 2014-03-31 07:12:16 -04:00
Ramiro Morales c0882fefca [1.6.x] Corrected an import in a model form docs example. 
422f5d9a2c from master.
 2014-03-30 20:37:02 -03:00
Tim Graham 30ba506e97 [1.6.x] Fixed #21858 -- Clarified 1.6 release note regarding M2M help text changes. 
Thanks lee at semel.net for the report.

Backport of f30e6590f4 from master
 2014-03-29 10:23:28 -04:00
Tim Graham f659c8e13a [1.6.x] Added Python 3.4 support notes. 
Backport of 306deab2c7 from master
 2014-03-27 08:14:39 -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 9b7ba8af1b 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
Tim Graham 90916e1708 [1.6.x] Fixed #22247 -- Replaced "upstream" with "downstream" in cache docs. 
Thanks valgarv at gmx.net for the report.

Backport of 60d2dde286 from master
 2014-03-24 09:19:50 -04:00
Tim Graham 7af32bca38 [1.6.x] Fixed #21665 -- Documented that changes in assertRedirects may be required given new URL escaping behavior. 
Thank pdc for the report.

Backport of 62e81bc00b from master
 2014-03-24 09:09:23 -04:00
Tim Graham 779ef57c37 [1.6.x] Updated six to 1.6.1. 
Backport of 2ec82c7387 from master
 2014-03-24 07:34:22 -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 5f7b3e56ce [1.6.x] Added release note about strip_tags improvement 
Backport of 1c8dbb0cc from master.
 2014-03-22 12:37:06 +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
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
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
Tim Graham f82eb49301 [1.6.x] Fixed #21701 -- Improved testing doc titles and added testing/tools.txt. 
Thanks cjerdonek for the suggestion.

Backport of 9953e98e6a from master
 2013-12-31 08:32:58 -05:00
Tim Graham 2d554d29f2 [1.6.x] Fixed #21708 -- Added some headings to separate unrelated topics. 
Thanks ashley at ashleymills.com for the suggestion.

Backport of 270f7e2167 from master
 2013-12-30 17:57:44 -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
Claude Paroz 2d08390d70 [1.6.x] Fixed #21618 -- Added hints about openlayers.js hosting 
Thanks kz26 for the report and Tim Graham for the excellent
review.
Backport of b7a7baa554 from master.
 2013-12-28 11:11:58 +01:00
Tim Graham 3b79fbabcd [1.6.x] Fixed #21650 -- Corrected bad advice for plural translation. 
Thanks nedbatchelder and claudep.

Backport of 85270ef3f5 from master
 2013-12-27 10:02:41 -05:00
Tim Graham f3a9a76123 [1.6.x] Fixed #21582 -- Corrected URL namespace example. 
Thanks oubiga for the report.

Backport of 025ec2e7fe from master
 2013-12-26 20:06:29 -05:00
Tim Graham 62f282a265 [1.6.x] Fixed #21629 -- Added instructions for loading MySQL time zone definitions. 
Thanks Aymeric for the suggestion.

Backport of d8d83777eb from master
 2013-12-26 15:50:49 -05:00
Jon Lønne 0e8138349e [1.6.x] Fixed #21627 -- Added unicode_literals to changepassword command. 
Fixed a crash when executing changepassword command when the user object
representation contained non-ASCII characters.

Backport of 398642fd9b from master
 2013-12-26 07:46:12 -05:00
Claude Paroz b536ad09ca [1.6.x] Fixed #21662 -- Kept parent reference in prepared geometry 
Thanks Robert Scott for the report.
Backport of 542198c1d0 from master.
 2013-12-26 11:14:25 +01:00
Tim Graham 847d2ab5b3 [1.6.x] Fixed #21663 -- Added missing WSGIPythonPath in mod_wsgi config. 
Thanks carrie.hazelton at altamiracorp.com for the report.

Backport of e82e7ae1e8 from master
 2013-12-25 06:11:20 -05:00
Unai Zalakain 54b04cc8e6 [1.6.x] Fixed #21213 -- Added docs for Django's mailing lists. 
Added docs/internals/mailing-lists.txt documenting the use of django's
mailing lists. All references across docs changed to point to this page.

The referencing makes use of substitution because there's no way to make
a :ref: link in a non-inline fashion in Sphinx. It also makes use of
rst_epilog Sphinx conf for making this substitutions across all the
docs.

Backport of 3895d8899d from master
 2013-12-19 09:24:13 -05:00
Tim Graham 438f9edff6 [1.6.x] Fixed #21585 -- Updated some links to 3rd party database projects. 
Thanks graeme.perrow at sap.com for the original report.

Backport of 23d9f517dc from master
 2013-12-18 18:50:36 -05:00
Tim Graham 07d3d57ded [1.6.x] Fixed #21613 -- Removed a hardcoded input id from the tutorial. 
Thanks Bruno Brouard for the report.

Backport of cc2d960274 from master
 2013-12-18 18:37:06 -05:00
Kevin Christopher Henry dd7e2925dd [1.6.x] Fixed #21632 -- Docs: Removed example with callable as query parameter 
Using callables as query parameters is undocumented and not working,
so this changes an example from the ForeignKey.limit_choices_to
documentation that uses it.

Backport of d34c8c338a from master
 2013-12-18 12:37:56 -05:00
Tianyi Wang 60517c9c09 [1.6.x] Fixed #21625 -- incorrect documentation for DiscoverRunner.build_suite 
Backport of b62031441b from master.
 2013-12-18 14:30:20 +01:00
Baptiste Mispelon e888760854 [1.6.x] Added some internal links to render_to_string documentation. 
Backport of 1689744aee from master.
 2013-12-15 23:03:26 +01:00
Tim Graham 6a36b71fc2 [1.6.x] Fixed typo in docs/ref/models/fields.txt 
Backport of dfc95d240d from master.
 2013-12-15 10:51:58 -05:00
Baptiste Mispelon 5192713285 [1.6.x] Added internal link to i18n documentation. 
Backport of e904d421d0 from master.
 2013-12-15 01:51:21 +01:00
Alasdair Nicol 15ab4936d7 [1.6.x] Fixed #21539 -- Added example of modelformset_factory's form argument 
Backport of 1fa681ee11 from master
 2013-12-14 16:36:21 -05:00
Chris Jerdonek ad8a7819f2 [1.6.x] Fixed #21614 -- improved docs on configuring email for development. 
Backport of d599b590eb from master
 2013-12-14 11:21:22 -05:00
Chris Jerdonek f39579e09f [1.6.x] Fixed link text for "Testing in Django" in tutorial 5. 
Backport of e1cfc4b96a from master
 2013-12-14 10:42:36 -05:00
johannes-gehrs eb4079597d [1.6.x] Fixed #21580 -- Clarified why render() does not return a TemplateResponse object. 
Backport of f685f94c98 from master
 2013-12-13 18:59:27 -05:00
Tim Graham 704f581081 [1.6.x] Added 1.6.2 release notes stub. 
Backport of ccd80dc3b6 from master
 2013-12-13 18:55:35 -05:00
Tim Graham 194c5ab056 [1.6.x] Added 1.6.1 release date. 2013-12-12 15:06:47 -05:00
Ben Spaulding de1d5d5df5 [1.6.x] Fixed #21594 -- Added note about model formsets deleting objects. 
This behavior has been fixed in 65e03a424e. refs #10284.
 2013-12-11 14:39:29 -05:00
Tim Graham 7a2910d790 [1.6.x] Additions and edits to the 1.6.1 release notes. 2013-12-11 12:34:50 -05:00
Claude Paroz ebf55d32c1 [1.6.x] Added release note for #21443 2013-12-11 16:37:25 +01:00
Claude Paroz b953b27a92 [1.6.x] Added release note for #21358 2013-12-11 16:13:55 +01:00
Claude Paroz 3f9d00e591 [1.6.x] Added release note for #21473 2013-12-11 16:06:29 +01:00
Claude Paroz d32637d81b [1.6.x] Fixed #21510 -- Readded search reset link in changelist search bar 
Thanks moritz.pfeiffer at alp-phone.ch for the report and
Tim Graham for the initial patch.
Backport of c7c647419c from master.
 2013-12-11 15:32:10 +01:00
Christian Schmitt d6d700fc6d [1.6.x] Fixed #21560 -- Added missing 'slug' field in example code. 
Backport of 744aac6dac from master
 2013-12-10 07:25:43 -05:00
Claude Paroz ef9832f148 [1.6.x] Updated a bunch of hyperlinks in documentation 
Backport of 626bdf648 from master.
 2013-12-08 18:48:30 +01:00
Claude Paroz 45c0d2e1ce [1.6.x] Fixed #21551 -- Reenabled loading fixtures from subdirectory 
This was a regression in Django 1.6 that was only partially
restored in 839940f27f.
Thanks Jonas Haag for the report.
Backport of 41ebc4838d from master.
 2013-12-07 10:48:34 +01:00
Claude Paroz 34c4b93c84 [1.6.x] Fixed #21568 -- Added missing ModelMultipleChoiceField to_python method 
Thanks dibrovsd at gmail.com for the report and Simon Charette
for the review.
Backport of 8a9c8bb90 from master.
 2013-12-07 10:21:05 +01:00
Baptiste Mispelon 7d75a33331 [1.6.x] Added fix for #21530 to 1.6.1 release notes. 
Backport of 19b22d4f0e from master.
 2013-12-07 03:40:58 +01:00
Alasdair Nicol 4f9590836c [1.6.x] Fixed #21562 -- Warned against using the same app name as a django contrib app. 
Thanks yourcelf for the report.

Backport of 317fd13c7a from master
 2013-12-05 19:10:49 -05:00
Alasdair Nicol 49fab30496 [1.6.x] Listed 1.6.x releases in descending order 
Backport of 0daa2f1bf1 from master
 2013-12-04 17:21:27 -05:00
Aymeric Augustin 6691abcdf0 [1.6.x] Fixed #21558 -- Support building CHM files. 
Thanks Michał Pasternak.

Backport of cd9e85ec from master.
 2013-12-04 16:51:37 +01:00