1
0
mirror of https://github.com/django/django.git synced 2025-03-24 08:10:45 +00:00

13286 Commits

Author SHA1 Message Date
Ramiro Morales
1220f22b88 [1.5.x] Fixed (again) use the right admin named URL.
This allows us to get the trailing slash in URLs without having to
manually assemble and hard-code them.

See also commits e9497a, a222d6, f51eab, 5a9e12.

Backport of 8fdb28219df22245d7e50b4e8374d8567ca84f0f from master.
2012-11-20 21:52:07 -03:00
Luke Plant
aab701f1aa [1.5.x] Corrected docs about default value of MESSAGE_STORAGE
Backport of a32f30c79c1be8e088917bced0f97760a92045ef from master
2012-11-20 23:06:38 +00:00
Claude Paroz
e15df5b6b5 [1.5.x] Fixed -- Added missing trailing slash in auth admin template
Thanks ppetrid at yawd.eu for the report.
Backport of 8c21c53c8 from master.
2012-11-20 19:21:17 +01:00
Riley Strong
e56c8d7e0a [1.5.X] Fixed typo in django.template.defaulttags
Backport of d179794c6b from master
2012-11-20 05:03:22 -05:00
Preston Holmes
3a0e0230f7 [1.5.x] Fixed -- Improved ModelAdmin.message_user API
Thanks to Lowe Thiderman for the patch and tests
2012-11-19 16:03:30 -08:00
Anton Danilchenko
5b6db35a74 [1.5.X] Fixed typo in docs/ref/models/querysets.txt
Backport of 76859e6eab from master
2012-11-19 18:46:36 -05:00
Anton Danilchenko
27ecabf73f [1.5.X] Fixed typo in docs/releases/1.5.txt
Backport of 3bdb2ca560 from master
2012-11-19 18:44:53 -05:00
Tim Graham
17c61aaea3 [1.5.X] Fixed - Improved syndication example.
Thanks brycenesbitt for the report.

Backport of 1f1f60d12f from master
2012-11-18 18:09:00 -05:00
Ramiro Morales
eb67a45a39 Updated admin base translation file. 2012-11-18 09:33:10 -03:00
Tim Graham
c262252c27 [1.5.X] Fixed - Clarified stringformat filter example
Thanks Shabda Raaj.

Backport of 2564e31014 from master
2012-11-17 19:32:51 -05:00
Tim Graham
31da2a5e56 [1.5.X] Fixed - Added an example of constructing a MultiWidget and documented the value_from_datadict method.
Backport of 04775b4598 from master
2012-11-17 17:55:05 -05:00
Aymeric Augustin
e8da482bbe [1.5.x] Fixed -- Improved markup in admin FAQ.
Thanks ClaesBas.

Backport of ccb2b57 from master.
2012-11-17 23:27:27 +01:00
Aymeric Augustin
6e598fee93 [1.5.x] Fix typo in file storage docs.
Backport of 4585e12 from master.
2012-11-17 23:27:05 +01:00
Aymeric Augustin
a586f2a7e5 [1.5.x] Fixed -- Completed deprecation of ADMIN_MEDIA_PREFIX.
Backport of 9b755a2 from master.
2012-11-17 23:05:16 +01:00
Tom Christie
9fa6aa9534 [1.5.x] Formatting tweaks.
(cherry picked from commit 3f2fc2f41abf226913517eb1e655f823f2c5e53a)
2012-11-17 21:31:21 +01:00
Tom Christie
2fdb7e6ca5 [1.5.x] Include versionadded 1.5 directive
(cherry picked from commit 5bc6929f9af4d71065bce42578e49354096a7bf4)
2012-11-17 21:31:07 +01:00
Tom Christie
d881275341 [1.5.x] Test for ListView.page_kwarg
(cherry picked from commit f824a951776db86c04aaefc1e7c1c12ffb84c798)
2012-11-17 21:30:47 +01:00
Tom Christie
2bfea36208 [1.5.x] Add 'page_kwarg' attribute to MultipleObjectMixin, removing hardcoded 'page'.
(cherry picked from commit 502be865c68635d5c31fa3fa58162b48412153ad)
2012-11-17 21:30:22 +01:00
Kent Hauser
94208399d9 [1.5.x] Add form to formwizard context (includes tests)
Backport of ba81164fb771391b92575b5aaab6e286f56eb831 from master.
2012-11-17 21:24:19 +01:00
Tim Graham
04adb7626b [1.5.X] Fixed - Added a contributing tutorial
Thank-you Taavi Taijala for the draft patch!

Backport of 7058b595b6 from master
2012-11-17 14:12:18 -05:00
Claude Paroz
3d4f5f6086 [1.5.x] Fixed -- Fixed LogEntry unicode representation
Thanks niko at neagee.net for the report and Emil Stenstrom for
the patch.
Backport of e0363c688 from master.
2012-11-17 19:21:09 +01:00
Claude Paroz
fc379b4865 [1.5.x] Fixed -- Fixed base64 uploads decoding
Thanks anthony at adsorbtion.org for the report, and johannesl for
bringing the patch up-to-date.
Backport of 2a67374b5 from master.
2012-11-17 17:26:24 +01:00
Claude Paroz
1b6e751430 [1.5.x] Fixed -- Applied linebreaksbr to read-only fields in admin
Thanks shadow for the report, and Melevir and thiderman for the
patch.
Backport of ec9d6b112 from master.
2012-11-17 17:12:24 +01:00
Claude Paroz
a023952e10 [1.5.x] Fixed -- Removed unused condition in CursorWrapper
Thanks zimnyx for the report.
Backport of 8c6927876 from master.
2012-11-17 16:54:12 +01:00
Preston Holmes
11539aad1e [1.5.x] Fixed -- changed method docs formatting for custom file storage docs 2012-11-17 07:13:37 -08:00
Jannis Leidel
0aaaad14b7 [1.5.x] Fixed typo introduced in 0e3f7814d7106768e8eafcba0e74238fcdb90f9d. 2012-11-17 15:59:34 +01:00
Gabriel Hurley
dd740e2b2e [1.5.x] Fixed -- Escaped special characters in reverse prefixes.
Ensured that special characters passed in to reverse via the
prefix argument are properly escaped so that calls to
django.utils.regex_helpers.normalize and/or string formatting
operations don't result in exceptions.

Thanks to toofishes for the error report.

Backport of 90e530978d590a5bdcf75525aa03f844766018b8 from master.
2012-11-17 15:51:10 +01:00
Jannis Leidel
0e3f7814d7 [1.5.x] Fixed -- Properly escape gettext context prefixes in the i18n JavaScript view template.
Backport of 4a5e8087ac7676ef08e76275c1f756778b39c13e from master.
2012-11-17 15:39:34 +01:00
Tim Graham
d69c3bf137 [1.5.X] Documented that contrib.sites creates a default site.
Thanks Lorin Hochstein for the patch.

Backport of ac4aa8a76c from master
2012-11-17 06:50:54 -05:00
Preston Holmes
0d49fdb573 [1.5.x] Fixed -- 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:08:02 -08:00
Brandon Adams
cefbf09a4d [1.5.X] Fixed docs noting comment_will_be_sent returns a 400, not a 403
Backport of d8ee46afff from master
2012-11-16 18:20:11 -05:00
Claude Paroz
b39b0aedbf [1.5.x] Fixed -- Applied test connection sharing for spatialite
Thanks pegler at gmail.com for the report and the initial patch.
Backport of ff0d3126af from master.
2012-11-16 14:33:59 +01:00
Anssi Kääriäinen
a1fd9555f2 [1.5.x] Fixed -- Removed autofield raw SQL inserts from tests
Backpatch of 71e14cf3aa024496adcb23e83ddf13a7c5ddeb32
2012-11-15 17:39:39 +02:00
Anssi Kääriäinen
33f1181c31 [1.5.x] Fixed -- Fixed Oracle GIS crash
The problem is the same as in  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 92d7f541da8b59520c833b19fbba52d3ecef2428
2012-11-15 16:11:22 +02:00
Tim Graham
dea4214bb5 [1.5.X] Fixed - 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 -- 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 -- 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 1e34fd3c03e8f9a9e2b9be35488b8209178a4df0 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
c159d9cec0baab7bbd04d5d51a92a51e354a722a.
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 .
2012-11-13 23:01:34 +02:00
Anssi Kääriäinen
538d6c0fcd Some changes to SortedDict to make it faster under py2
Refs 
2012-11-13 23:01:25 +02:00
Aymeric Augustin
5e9af1600d [1.5.x] Fixed -- 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 - 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  for details.

Backport of 6c69de8 from master.
2012-11-11 21:25:30 +01:00
Anssi Kääriäinen
825a793555 [1.5.x] Fixed -- 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 [cc0ac26f4a3947be8a3fc55d4784d3474b640c23].
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 -- 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 -- Support cookie pickling in SimpleTemplateResponse
Refs .
Backport of 4d817b3887 from master.
2012-11-09 21:11:36 +01:00