mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-19 13:50:45 +00:00
Code Issues 32 Releases Wiki Activity
13,356 Commits 29 Branches 438 Tags
Commit Graph

2869 Commits

Author SHA1 Message Date
Sebastián Magrí
237a404d3e [1.5.x] Fixed #19318 -- Ensured that the admin's SimpleListFilter options can be displayed as selected even if the lookup's first element is not a string. 
Backport of 88e17156393b
 2012-12-03 11:55:33 -08:00
Claude Paroz
3d62eaea69 [1.5.x] Fixed #19416 -- Fixed multi-line commands in initial SQL files 
Thanks Aymeric Augustin for detecting this regression.
Backport of 5fa5621f5 from master.
 2012-12-03 20:49:28 +01:00
Aymeric Augustin
c9a47fb379 [1.5.x] Fixed #19397 -- Crash on binary files in project templates. 
Thanks gw 2012 at tnode com for the report.

Backport of baae4b8.
 2012-12-03 10:45:42 +01:00
Claude Paroz
1b93499849 [1.5.x] Fixed #19015 -- Add ISO input formats to all formats 
Backport of 349c4c37f8 from master.
 2012-12-01 15:43:38 +01:00
Claude Paroz
47c5b50d34 [1.5.x] Fixed #19354 -- Do not assume usermodel.pk == usermodel.id 
Thanks markteisman at hotmail.com for the report.
Backport of 0eeae1505 from master.
 2012-11-29 21:52:22 +01:00
Anssi Kääriäinen
957de74ebe [1.5.x] Converted a couple of assertEquals -> assertEqual 2012-11-28 23:55:47 +02:00
Tai Lee
a21e8dee76 [1.5.x] Fixed #14694 -- Made `defer()` work with reverse relations 
Reverse o2o fields are now usable with defer.

Backpatch of [6ebf115206289bce8f3d86318871faac13d6e835]
 2012-11-28 18:25:34 +02:00
Danilo Bargen
5509eb8626 [1.5.x] Fixed #19370 -- Made date filter properly handle midnight value 
Backport of c10aaa70a from master.
 2012-11-27 21:25:21 +01:00
Edward Tjörnhammar
7c91b67cfa [1.5.x] Fixed #17911 -- Ensure that admin readonly fields' display values are shown in change forms when the raw value is None. 
Backport of 29d59a879ea5b116
 2012-11-25 23:16:44 +01:00
Julien Phalip
22ca5bab95 [1.5.x] Fixed #17646 -- Added a get_list_filter() method to ModelAdmin. Thanks to rasca for the suggestion and to mateusgondim for the patch. 
Backport of ae206d78f6d991e
 2012-11-25 20:43:18 +01:00
Claude Paroz
02ab5d180e [1.5.x] Fixed test failure following capitalization fix in 2f035a972 
Backport of f26b956e80 from master.
 2012-11-25 19:55:23 +01:00
Aymeric Augustin
37c54c27bd [1.5.x] Change exception type to reduce confusion. 
TemplateSyntaxError is expected at compile time, not at run time.

Refs #19280.

Backport of 7644800.
 2012-11-25 19:53:50 +01:00
Claude Paroz
6945f60c2b [1.5.x] Enabled SimpleTestCase to be decorated by override_settings 
Refs #18417. Also fixed some test case classes which subclassed
the wrong parent.
Backport of a5d47415f from master.
 2012-11-25 19:08:51 +01:00
Claude Paroz
4389b51fab [1.5.x] Fixed #18417 -- Raised exception when unittest.TestCase is decorated with override_settings 
Backport of 9f7cefd5 from master.
 2012-11-25 19:08:27 +01:00
Aymeric Augustin
8c2f36260e [1.5.x] Fixed #19280 -- Raised an explicit exception for the old {% url %} syntax. 
Backport of 6b8a7ce.
 2012-11-24 22:05:41 +01:00
Aymeric Augustin
f1afd57a32 [1.5.x] Used a django.test.TestCase for compatibility with @override_settings. 
These tests were silently skipped.

Backport of 95edeab.
 2012-11-24 22:05:25 +01:00
Anssi Kääriäinen
0d3ec8d0fb [1.5.x] Fixed ordering-related failure in m2m_through_regress tests 
Backpatch of dc569c880143db07e01b3293d698ad8fe4a0136f
 2012-11-24 16:05:30 +02:00
Chris Khoo
9efe1a7210 [1.5.x] Fixed #19237 -- Improved strip_tags utility 
The previous pattern didn't properly addressed cases where '>'
was present inside quoted tag content.
Backport of bf1871d87 from master.
 2012-11-24 12:20:41 +01:00
Russell Keith-Magee
2ecf3a9344 [1.5.x] Simplified the deletions performed by the swappable_models test. 
This is required to allow the test to run without error under SQLite in the CI environment.

Backport of 18d7c1e.
 2012-11-24 15:08:28 +08:00
Russell Keith-Magee
3fd8458fb3 [1.5.x] Fixed #19806 -- Ensure that content types and permissions aren't created for swapped models. 
Thanks to rizumu for the report.

Backport of c8985a8a7317042a641e870cb75b3005cc5d67b1.
 2012-11-24 14:26:50 +08:00
Anssi Kääriäinen
421e599ad3 [1.5.x] Fixed #19351 -- SQLite bulk_insert of more than 500 single-field objs 
Backpatch of 0a0a0d66b316598f7c296e8bf75749a14ce3ac49
 2012-11-24 01:20:22 +02:00
Anssi Kääriäinen
625dc3f072 [1.5.x] Fixed SQLite's collapsing of same-valued instances in bulk_create 
SQLite used INSERT INTO tbl SELECT %s UNION SELECT %s, the problem
was that there should have been UNION ALL instead of UNION.

Refs #19351

Backpatch of a27582484cf814554907d2d1ad077852de36963f
 2012-11-24 01:19:17 +02:00
Aymeric Augustin
a892cd3191 [1.5.x] Tweak a test to avoid hitting a limit with SQLite. 
Django cannot delete more than 999 objects at a time with SQLite.

Refs #16426, #16039.

Backport of 2875b5d from master.
 2012-11-23 10:19:09 +01:00
Tim Graham
42fa51c002 [1.5.X] Fixed #18974 - Warned against using models.permalink 
Thanks dstufft for the draft patch.

Backport of 0e3690d230 from master
 2012-11-22 16:10:42 -05:00
Aymeric Augustin
9bd67f056c [1.5.x] Fixed #16039 -- Made post_syncdb handlers multi-db aware. 
Also reverted 8fb7a9002669fb7ba7bec7df90b465b92e1ed3c2. Refs #17055.

Backport of a026e48 from master.
 2012-11-22 20:54:20 +01:00
George Hickman
12cf9d2be3 [1.5.x] Fixed #19316 -- Set View args/kwargs/request before dispatch 
Backport of ea6b95db from master.
 2012-11-22 20:14:04 +01:00
Julien Phalip
699a67480a [1.5.x] Modified a staticfiles test to use a unicode character that has just one single representation. The previously used character (ş) has two different representations (u'\u015f' and u's\u0327'), which caused spurious failures when the tests were run across multiple platforms (e.g. on a Linux VM hosted on a Mac). 2012-11-21 09:54:02 +01:00
Preston Holmes
3a0e0230f7 [1.5.x] Fixed #18658 -- Improved ModelAdmin.message_user API 
Thanks to Lowe Thiderman for the patch and tests
 2012-11-19 16:03:30 -08: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
Claude Paroz
3d4f5f6086 [1.5.x] Fixed #19114 -- 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 #19036 -- 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 #19226 -- 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
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 #18210 -- 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 #19136 -- Properly escape gettext context prefixes in the i18n JavaScript view template. 
Backport of 4a5e8087ac7676ef08e76275c1f756778b39c13e from master.
 2012-11-17 15:39:34 +01:00
Preston Holmes
0d49fdb573 [1.5.x] 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:08:02 -08:00
Anssi Kääriäinen
a1fd9555f2 [1.5.x] Fixed #18347 -- Removed autofield raw SQL inserts from tests 
Backpatch of 71e14cf3aa024496adcb23e83ddf13a7c5ddeb32
 2012-11-15 17:39:39 +02: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
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 45802e12481 from master.
 2012-11-09 19:44:13 +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 [cafb266954e21dd55ddfa90597bcf02c022bcb7d]

Conflicts:

	django/db/models/sql/compiler.py
 2012-11-08 01:10:24 +02: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
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 5a00a57aa591c766f5ee1d8c59b64618d74fe191 2012-11-04 23:39:56 -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
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 8d3f932f18c75fcbb32cf3dd5998445d65b5db0f
 2012-11-04 14:21:49 -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 4285571c5a9bf6ca3cb7c4d774942b9ae5b537e4. 2012-11-04 10:26:59 -08:00