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

15505 Commits

Author SHA1 Message Date
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
Florian Apolloner e99eeefe44 [1.6.x] Decode mails using the message encoding. 
Backport of bfe9052831 from master.
 2013-12-31 12:10:22 +01:00
Florian Apolloner d18f99dfc7 [1.6.x] Changed console and filebackend to use msg.as_bytes to output the data as it would get send via smtp. 
Backport of c988745cca from master.
 2013-12-31 12:09:52 +01:00
Florian Apolloner 7c674dd1f1 [1.6.x] Introduced as_bytes for SafeMIMEText (and other SafeMIME-classes). 
This is to provide a consistent interface (namely bytes) for the smtp
backend which after all sends bytes over the wire; encoding with as_string
yields different results since mails as unicode are not really specified.

as_string stays for backwardscompatibilty mostly and some debug outputs.
But keep in mind that the output doesn't match as_bytes!

Backport of 5dfd824d38 from master.
 2013-12-31 12:05:59 +01: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
Florian Apolloner ed167e53a5 [1.6.x] Worked around a bug in python 3.3.3. Refs #21093 
Backport of 280c1a65cc from master.
 2013-12-28 16:01:40 +01:00
Florian Apolloner 35a447a263 [1.6.x] Fixed #21093 -- Ensured that mails are not base64 encoded on python 3.3.3+. 
Thanks to Arfrever for the report and Aymeric for the review.

Backport of f28ea02308 from master.
 2013-12-28 12:48:54 +01: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
Loic Bistuer 3bb7de8c7c [1.6.x] Fixed typo and slightly improved error message when db is missing time zone definitions. 
Refs #21432.

Backport of 32e75803be from master
 2013-12-26 13:07:04 -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
Claude Paroz f05b381845 [1.6.x] Removed weird unicode char in some de po files 
Refs #21601.
 2013-12-13 08:21:20 +01:00
Tim Graham 1c18c7f8ae [1.6.x] Post release version bump. 2013-12-12 15:15:35 -05:00
Tim Graham 194c5ab056 [1.6.x] Added 1.6.1 release date. 2013-12-12 15:06:47 -05:00
Jacob Kaplan-Moss 073eed9517 Bumped version number for 1.6.1. 2013-12-12 13:48:32 -06: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
Ludwik Trammer c558a43fd6 [1.6.x] Fixed #21473 -- Limited language preservation to logout 
Current language is no longer saved to session by LocaleMiddleware
on  every response (the behavior introduced in #14825).
Instead language stored in session is reintroduced into new session
after logout.
 2013-12-11 15:49:27 +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
Claude Paroz 64483b4831 [1.6.x] Updated translations from Transifex 2013-12-10 21:14:22 +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