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

13753 Commits

Author SHA1 Message Date
Anssi Kääriäinen 33f1181c31 [1.5.x] 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.

Backpatch of 92d7f541da
 2012-11-15 16:11:22 +02:00
Tim Graham dea4214bb5 [1.5.X] Fixed #19289 - Removed an out of place sentence in tutorial 2. 
Thanks colinnkeenan for the report.

Backport of 2dbfa66f4d from master
 2012-11-14 05:49:12 -05:00
Claude Paroz ebafba50a4 [1.5.x] Fixed #19272 -- Fixed gettext_lazy returned type on Python 2 
Thanks tyrion for the report.
Backport of 550ddc66b from master.
 2012-11-14 10:55:12 +01:00
Claude Paroz 8967906e0a [1.5.x] Fixed #19186 -- Fixed sending mail with unicode content on Python 3 
Thanks alex_po for the report and Luke Plant for the analysis.
Backport of 1620c27936 from master.
 2012-11-14 10:45:57 +01:00
Alex Gaynor 911d3581ea [1.5.x] fixed a broken link in the docs. Backport of 1e34fd3c03 2012-11-13 14:49:08 -08:00
David Cramer d33f8d0f54 [1.5.x] Correct link to Sentry 
django-sentry is no longer maintained, and sentry is the replacement.

Backport of 54fbe6c and c91a127 from master, as requested by Mr Gaynor.
 2012-11-13 23:00:35 +01:00
Anssi Kääriäinen af044d86b8 Fixed select_related performance regressions 
The regression was caused by select_related fix for Oracle, commit
c159d9cec0.
 2012-11-13 23:02:08 +02:00
Anssi Kääriäinen fe21c233d4 Removed use of SortedDict for query.alias_refcount 
This will have a smallish impact on performance. Refs #19276.
 2012-11-13 23:01:34 +02:00
Anssi Kääriäinen 538d6c0fcd Some changes to SortedDict to make it faster under py2 
Refs #19276
 2012-11-13 23:01:25 +02:00
Aymeric Augustin 5e9af1600d [1.5.x] Fixed #19283 -- Fixed typo in imports in CBV docs. 
Backport of 00ff69a from master.
 2012-11-13 20:47:26 +01:00
Tim Graham 897d8adb1c [1.5.X] Fixed #19260 - Added a comment to tutorial 1. 
Thanks terwey for the suggestion.

Backport of a72b8a2247 from master
 2012-11-13 05:46:46 -05:00
Nicolas Ippolito b3ea37e304 [1.5.X] Typo in comments doc 
Backport of 17b14d4819 from master
 2012-11-13 05:25:11 -05:00
Aymeric Augustin 3db2aeec98 [1.5.x] Tweaked cache key creation to avoid strict typing. 
This is a provisional change. See #19221 for details.

Backport of 6c69de8 from master.
 2012-11-11 21:25:30 +01:00
Anssi Kääriäinen 825a793555 [1.5.x] 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.

Backpatch of [cc0ac26f4a].
 2012-11-10 19:48:27 +02:00
Claude Paroz 48a2917d46 [1.5.x] Removed an impossible code path in cache function 
Backport of 04a7ea328 from master.
 2012-11-10 15:45:45 +01:00
Claude Paroz e6bc0c5bab [1.5.x] Fixed #14264 -- Ensured settings.configure configures logging 
Thanks Matt McDonald for the patch.
Backport of 34162698c from master.
 2012-11-10 12:10:43 +01:00
Sean Breant 6554137eeb [1.5.x] Fixed #19262 -- Support cookie pickling in SimpleTemplateResponse 
Refs #15863.
Backport of 4d817b3887 from master.
 2012-11-09 21:11:36 +01:00
Claude Paroz dc95791e61 [1.5.x] Fixed #19261 -- Delayed Queryset evaluation in paginators 
Thanks trbs for the report and the patch.
Backport of 1b307d6c8f from master.
 2012-11-09 19:44:47 +01:00
Claude Paroz bf35fb6006 [1.5.x] Merged pagination tests 
It is simpler/cleaner to have all pagination tests in a single file.
Refs #16122.
Backport of 45802e1248 from master.
 2012-11-09 19:44:13 +01:00
Florian Apolloner 31eefc8349 [1.5.X] Added missing encoding preamble to gis tests. 
'coverage html' did fail without it.

Thanks to Claude Paroz for figuring it out.

Backport of aea8bf0662 from master.
 2012-11-09 15:33:37 +01:00
Tim Graham 3344d8de3e [1.5.x] Merge pull request #506 from gwrtheyrn/ipv6_doc_fix 
Fixed invalid ipv4 mapped ipv6 addresses in docs

Backport of 19eb56a277 from master
 2012-11-09 05:49:27 -05:00
Claude Paroz 087274d08f [1.5.x] Fixed #19266 -- Added Texinfo documentation target 
Thanks orontee for the report and initial patch.
Backport of a79d920a56 from master.
 2012-11-09 09:03:52 +01:00
Anssi Kääriäinen 908226cf1a [1.5.x] Fixed #17144 -- MySQL again groups by PK only 
Thanks to Christian Oudard for the report and tests.

Backpatch of [cafb266954]

Conflicts:

	django/db/models/sql/compiler.py
 2012-11-08 01:10:24 +02:00
Claude Paroz b872617924 [1.5.x] Fixed #19115 -- Documented stdout/stderr options for call_command 
Thanks d1ffuz0r for helping with the patch.
Backport of b1ac329ba from master.
 2012-11-07 18:36:17 +01:00
Claude Paroz 34d0c30e87 [1.5.x] Fixed #19257 -- Don't swallow command's KeyError in call_command 
Thanks Giovanni Bajo for the report.
Backport of 9a09558e9f from master.
 2012-11-07 18:30:10 +01:00
Tim Graham 5b190733e9 [1.5.X] Fixed #19161 - Added missing clean_password method in custom user docs 
Thanks DavidW for the report.

Backport of e8f696097b from master
 2012-11-06 19:46:40 -05:00
Tim Graham 4f36ea451d [1.5.X] Fixed #15968 - Noted that readonly_fields are excluded from the ModelForm 
Backport of a386675a6a from master
 2012-11-06 19:04:38 -05:00
Tim Graham 84e33545c9 [1.5.X] Fixed #19154 - Noted commit_manually requires commit/rollback for reads 
Thanks als for the report.

Backport of 620e0bba49 from master
 2012-11-06 17:50:00 -05:00
Claude Paroz e645c89bbb [1.5.x] Fixed #14315 -- Made memcached backend handle negative incr/decr values 
Thanks Michael Manfre for the report and initial patch and
Tobias McNulty for the review.

Backport of 79dd751b0b from master.
 2012-11-06 12:23:32 +01:00
Tim Graham 79209dfdc5 [1.5.X] Fixed #19246 - Updated SECURE_PROXY_SSL_HEADER example to use 'X-Forwarded-Proto' 
Thanks Fred Palmer for the report.

Backport of 2cc1884383 from master
 2012-11-06 05:18:12 -05:00
Aymeric Augustin 93e0ec553d [1.5.x] Fixed #19254 -- Bug in SESSION_FILE_PATH handling. 
Thanks simonb for the report.

Refs #18194.

Backport of 11fd00c from master.
 2012-11-06 10:21:30 +01:00
Tim Graham f7d87b30fb [1.5.X] Fixed #15591 - Clarified interaction between ModelForm and model validation. 
Backport of d3fd8a1512 from master
 2012-11-05 18:30:50 -05:00
Claude Paroz a23c9c48a8 [1.5.x] Fixed #8627 -- Prevented textareas to swallow first newline content 
Browsers consider the first newline in textareas as some display
artifact, not real content. Hence they are not sending it back to
the server. If we want to keep initial newlines, we have to add one
when we render the textarea.
Thanks bastih for the report and initial patch.

Backport of 78f66691ee from master.
 2012-11-05 20:56:25 +01:00
Preston Holmes c7d5e7c75b [1.5.x] Fixed py3 compatibility for 5a00a57aa5 2012-11-04 23:39:56 -08:00
Anton I. Sipos 81342c28c6 [1.5.x] Fixed #18949 -- Fix broken test interactions in ModelForms tests 
A test in Model Forms test was specifically referring to a fixed
primary key, which was now being used up in a newly committed.
This has been worked around by specifying a higher primary
key.
 2012-11-04 18:37:01 -08:00
Daniel Greenfeld dbe984c397 Fixed #19241 -- Improved floatformat docs 
Demonstrate how to round to integers using floatformat templatetag
 2012-11-04 17:45:30 -08:00
Alex Gaynor d35b95c2f4 Merge branch 'stable/1.5.x' of https://github.com/django/django into stable/1.5.x 2012-11-04 15:58:54 -08:00
Alex Gaynor d828d4e186 [1.5.x] Merge pull request #495 from aisipos/ticket_18949 
Fixed #18949 -- Improve performance of model_to_dict with many-to-many

Backport of 4d766b3c9a.
 2012-11-04 15:58:37 -08:00
Preston Holmes b85cb92ba9 [1.5.x] Fixed #19240 -- include pagination error details in ListView 404 
Thanks to seawolf for the patch
 2012-11-04 15:52:41 -08:00
Alex Gaynor f7552a2889 [1.5.x] Corrected a typo that inadvertently made its way into the docs. Backport of 0a49e6164c. 2012-11-04 15:45:20 -08:00
Alex Gaynor 32d5f03f10 [1.5.x] Added multi-column indexes to the 1.5 release notes. Backport of 957787ace0. 2012-11-04 15:41:58 -08:00
Alex Gaynor 69a0c91c90 [1.5.x]Merge pull request #494 from mrj0/model_split 
model_split: Fixed #19236 - fixed error for abstract models with a split method

Backport of 8d3f932f18
 2012-11-04 14:21:49 -08:00
Preston Holmes 3bb8c6e1cd [1.5.x] Added a note and link to CLA from contributing docs 2012-11-04 12:26:23 -08:00
Alex Gaynor 4f6e9c6af2 [1.5.x] Merge pull request #493 from edavis/fix-get-foo-display-docs 
Fixed formatting of get_FOO_display example
 2012-11-04 11:18:45 -08:00
Alex Gaynor 6f716e9e5f [1.5.x] Fixed #5805 -- it is now possible to specify multi-column indexes. Thanks to jgelens for the original patch. Backport of 4285571c5a. 2012-11-04 10:26:59 -08:00
Tim Graham 26e0651c42 [1.5.X] Fixed #19090 - Added PostgreSQL connection note. 
Thanks Melevir for the patch.

Backport of 249c3d730e from master
 2012-11-04 05:35:38 -05:00
Claude Paroz b61778dcf6 [1.5.x] Fixed #6234 -- Removed obsolete note about json and ensure_ascii 
Thanks aaron at cellmap.ca for the report.
Backport of 4e8d9524c from master.
 2012-11-03 23:56:04 +01:00
Aymeric Augustin d7688a010a [1.5.x] Fixed #18963 -- Used a subclass-friendly pattern 
for Python 2 object model compatibility methods.

Backport of fc10418 from master.
 2012-11-03 22:08:05 +01:00
Aymeric Augustin be6522561f [1.5.x] Fixed #15152 -- Avoided crash of CommonMiddleware on broken querystring 
Backport of 973f539 from master.
 2012-11-03 21:28:49 +01:00
Claude Paroz e51a9c0c94 [1.5.x] Prevented host resolution when running dev server 
Refs #19075, #2494.
Thanks Karen Tracey for spotting the issue.

Backport of 3e98d98b6 from master.
 2012-11-03 20:13:18 +01:00