Commit Graph

13499 Commits

Author SHA1 Message Date
Jannis Leidel b884802346 Merge branch 'master' of github.com:django/django 2012-11-17 15:44:28 +01:00
Jannis Leidel 4a5e8087ac Fixed #19136 -- Properly escape gettext context prefixes in the i18n JavaScript view template. 2012-11-17 15:37:30 +01:00
Tim Graham ac4aa8a76c Documented that contrib.sites creates a default site.
Thanks Lorin Hochstein for the patch.
2012-11-17 06:49:28 -05:00
Preston Holmes 44046e8a38 Fixed #18985 -- made DeprecationWarnings loud
Capture warnings in Python >= 2.7 and route through
console handler, which is subject to DEBUG==True

Thanks to dstufft for the idea, and claudep for initial patch
2012-11-16 17:07:38 -08:00
Tim Graham b4a98e028a Merge pull request #521 from emidln/master
Fixed docs noting comment_will_be_sent signals return 400 status code
2012-11-16 15:19:33 -08:00
Brandon Adams d8ee46afff comment_will_be_sent can cause a 400, not a 403
Doc cleanup for django.contrib.comments.signals.comment_will_be_sent
If a receiver returns False, an HttpResponse with status code 400
is returned. A test case already exists confirming this behavior.
Updated docs to reflect reality.
2012-11-16 10:19:54 -05:00
Claude Paroz ff0d3126af Fixed #19296 -- Applied test connection sharing for spatialite
Thanks pegler at gmail.com for the report and the initial patch.
2012-11-16 14:32:36 +01:00
vanschelven 5e3b99d4cf Update django/contrib/flatpages/forms.py
Translate before passing in the variables (i.e. close the bracket earlier).
If you translate after passing in the variables the translated value will contain the actual values for 'url' and 'site' and will therefore not be translated.

(I'm not actually using django's flatpages, but I ran into this apparent error when doing a global grep on my own project)
2012-11-15 22:53:08 +01:00
Anssi Kääriäinen 7cfb567e45 Another regression fix for select_related handling
This time gis compiler.get_default_columns() wasn't up to date. Thanks
to CI another regression fixed.

Refs #13781
2012-11-15 21:33:56 +02:00
Anssi Kääriäinen 1194a96999 Fixed a regression in select_related
The regression was caused by the fix for #13781 (commit
f51e409a5f). Reason was leaving
off some crucial lines when resolving a merge conflict.
2012-11-15 20:17:57 +02:00
Anssi Kääriäinen 71e14cf3aa Fixed #18347 -- Removed autofield raw SQL inserts from tests 2012-11-15 17:31:08 +02:00
Anssi Kääriäinen f51e409a5f Fixed #13781 -- Improved select_related in inheritance situations
The select_related code got confused when it needed to travel a
reverse relation to a model which had different parent than the
originally travelled relation.

Thanks to Trac aliases shauncutts for report and ungenio for original
patch (committed patch is somewhat modified version of that).
2012-11-15 17:15:21 +02:00
Anssi Kääriäinen 92d7f541da Fixed #19058 -- Fixed Oracle GIS crash
The problem is the same as in #10888 which was reintroduced when
bulk_insert was added. Thanks to Jani Tiainen for report, patch and
also testing the final patch on Oracle GIS.
2012-11-15 16:08:06 +02:00
Tim Graham 2dbfa66f4d Fixed #19289 - Removed an out of place sentence in tutorial 2.
Thanks colinnkeenan for the report.
2012-11-14 05:46:30 -05:00
Claude Paroz 550ddc66b4 Fixed #19272 -- Fixed gettext_lazy returned type on Python 2
Thanks tyrion for the report.
2012-11-14 10:50:15 +01:00
Claude Paroz 1620c27936 Fixed #19186 -- Fixed sending mail with unicode content on Python 3
Thanks alex_po for the report and Luke Plant for the analysis.
2012-11-14 10:43:33 +01:00
Alex Gaynor 1e34fd3c03 fixed a broken link in the docs 2012-11-13 14:48:23 -08:00
Alex Gaynor c91a12716d Merge pull request #516 from dcramer/master
Correct link to Sentry
2012-11-13 13:58:09 -08:00
David Cramer 54fbe6ce5f Correct link to Sentry
django-sentry is no longer maintained, and sentry is the replacement.
2012-11-13 13:51:50 -08:00
Anssi Kääriäinen ebcf6b36ff Fixed select_related performance regressions
The regression was caused by select_related fix for Oracle, commit
c159d9cec0.
2012-11-13 22:52:58 +02:00
Anssi Kääriäinen ce1af8d702 Removed use of SortedDict for query.alias_refcount
This will have a smallish impact on performance. Refs #19276.
2012-11-13 22:48:25 +02:00
Anssi Kääriäinen fa18b0ac89 Some changes to SortedDict to make it faster under py2
Refs #19276
2012-11-13 22:48:25 +02:00
Aymeric Augustin 00ff69a827 Fixed #19283 -- Fixed typo in imports in CBV docs. 2012-11-13 20:46:29 +01:00
Aymeric Augustin e27a43cc54 Merge pull request #509 from pydanny/ticket_19244
Fixed #19244 -- Provided examples for some built-in templatetags and filters
2012-11-13 04:42:53 -08:00
Tim Graham a72b8a2247 Fixed #19260 - Added a comment to tutorial 1.
Thanks terwey for the suggestion.
2012-11-13 05:45:08 -05:00
Tim Graham 7733f14631 Merge pull request #514 from nippo/master
Typo in comments doc
2012-11-13 02:24:33 -08:00
Daniel Greenfeld 3f65f751a0 Converted <paragraph> to <p> per #aaugustin's request 2012-11-12 16:12:27 -08:00
Nicolas Ippolito 17b14d4819 Typo in comments doc 2012-11-12 22:15:41 +01:00
Adrian Holovaty 09a39ca082 Negligible spacing fix in utils/log.py 2012-11-12 14:19:11 -06:00
Aymeric Augustin 6c69de80bd Tweaked cache key creation to avoid strict typing.
This is a provisional change. See #19221 for details.
2012-11-11 21:23:45 +01:00
Aymeric Augustin 4c5cea7073 Merge pull request #218 from mgrouchy/ticket_18582
Fixed #18582 -- Added a no-op close to BaseCache
2012-11-11 07:18:45 -08:00
Anssi Kääriäinen cc0ac26f4a Fixed #19273 -- Fixed DB cache backend on pg 9.0+ and py3
There was a problem caused by Postgres 9.0+ having bytea_output default
value of 'hex' and cache backend inserting the content as 'bytes' into
a column of type TEXT. Fixed by converting the bytes value to a string
before insert.
2012-11-10 19:42:20 +02:00
Ryan Kaskel bfdedb687a Allow custom User models to use the UserAdmin's change password view. 2012-11-10 15:48:46 +00:00
Claude Paroz 04a7ea3283 Removed an impossible code path in cache function 2012-11-10 15:42:27 +01:00
Claude Paroz 34162698cc Fixed #14264 -- Ensured settings.configure configures logging
Thanks Matt McDonald for the patch.
2012-11-10 12:05:58 +01:00
Sean Breant 4d817b3887 Fixed #19262 -- Support cookie pickling in SimpleTemplateResponse
Refs #15863.
2012-11-09 21:07:53 +01:00
Claude Paroz 1b307d6c8f Fixed #19261 -- Delayed Queryset evaluation in paginators
Thanks trbs for the report and the patch.
2012-11-09 19:41:57 +01:00
Tom Christie 3f2fc2f41a Formatting tweaks. 2012-11-09 16:16:58 +00:00
Tom Christie 5bc6929f9a Include `versionadded 1.5` directive 2012-11-09 16:15:19 +00:00
Florian Apolloner aea8bf0662 Added missing encoding preamble to gis tests.
'coverage html' did fail without it.

Thanks to Claude Paroz for figuring it out.
2012-11-09 15:16:06 +01:00
Tim Graham 19eb56a277 Merge pull request #506 from gwrtheyrn/ipv6_doc_fix
Fixed invalid ipv4 mapped ipv6 addresses in docs
2012-11-09 02:48:32 -08:00
Claude Paroz a79d920a56 Fixed #19266 -- Added Texinfo documentation target
Thanks orontee for the report and initial patch.
2012-11-09 09:00:27 +01:00
Daniel Greenfeld 1db5d88273 Added examples for comment, templatetag, escape, force_escape, timesince, and timeuntil 2012-11-08 16:35:39 -08:00
Claude Paroz 9942adac17 Made Page class inherit collections.Sequence 2012-11-08 16:13:23 +01:00
Claude Paroz 45802e1248 Merged pagination tests
It is simpler/cleaner to have all pagination tests in a single file.
Refs #16122.
2012-11-08 11:07:16 +01:00
Anssi Kääriäinen cafb266954 Fixed #17144 -- MySQL again groups by PK only
Thanks to Christian Oudard for the report and tests.
2012-11-08 00:56:32 +02:00
Claude Paroz b1ac329ba9 Fixed #19115 -- Documented stdout/stderr options for call_command
Thanks d1ffuz0r for helping with the patch.
2012-11-07 18:31:14 +01:00
Claude Paroz 9a09558e9f Fixed #19257 -- Don't swallow command's KeyError in call_command
Thanks Giovanni Bajo for the report.
2012-11-07 18:28:53 +01:00
Danilo Bargen b0c72d0a30 Fixed invalid ipv4 mapped ipv6 addresses in docs 2012-11-07 17:13:06 +01:00
Tim Graham e8f696097b Fixed #19161 - Added missing clean_password method in custom user docs
Thanks DavidW for the report.
2012-11-06 19:44:49 -05:00