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

2887 Commits

Author SHA1 Message Date
Claude Paroz 0bbc7c2b49 [1.5.x] Fixed #19483 -- Improved import error message in contrib.comments 
Thanks Valentin Lorentz for the report and the suggested fix.
Backport of ed711c4bd from master.
 2012-12-16 21:13:30 +01:00
Russell Keith-Magee 06b5f5fcb6 [1.5.X] Corrected tests depending on the error message on the AuthenticationForm. 
Refs #19368, and the fix introduced in 27f8129d64.

Backport of 9facca28b6 from trunk.
 2012-12-16 07:22:25 +08:00
Florian Apolloner deb205b8ce [1.5.X] Fixed an order dependant test failure. 
Backport of 7e97f4f510 from master.
 2012-12-11 16:26:53 +01:00
Florian Apolloner 919fbe08c9 [1.5.X] Fixed a test failure in the comment tests. 
Backport of 1eb0da1c5b from master.
 2012-12-10 23:36:17 +01:00
Florian Apolloner 77b06e4151 [1.5.X] Fixed a security issue in get_host. 
Full disclosure and new release forthcoming.
 2012-12-10 22:13:28 +01:00
Florian Apolloner fce1fa0f7f [1.5.X] Fixed #18856 -- Ensured that redirects can't be poisoned by malicious users. 2012-12-10 22:13:28 +01:00
Claude Paroz 984cf8417b [1.5.x] Amended an SQL test fixture to not include an id value 
Some backends might need special handling for auto-increment values.
This was introduced in 5fa5621f57. Thanks Michael Manfre for spotting
the issue.
Backport of 0cdfa76e68 from master.
 2012-12-10 17:50:37 +01:00
Aymeric Augustin d6bad2e9ea [1.5.x] Fixed #19392 -- Improved error for old-style url tags with dashes. 
Thanks dloewenherz for the report.

Backport of 4951932 from master.
 2012-12-09 16:18:52 +01:00
Claude Paroz fce779475e [1.5.x] Removed US localflavor-specific tests from core 
Also fixes #9045.
Backport of 8248d1402 from master.
 2012-12-08 21:08:37 +01:00
Claude Paroz fa54604606 [1.5.x] Fixed #19423 -- Prevented ModelAdmin sharing widgets due to formfield_overrides 
Thanks joebuyer at manycycles.com for the report and Simon Charette
for the review.
Backport of 04e6542b5 from master.
 2012-12-08 12:47:33 +01:00
Claude Paroz 4214a22e06 [1.5.x] Fixed #19357 -- Allow non-ASCII chars in filesystem paths 
Thanks kujiu for the report and Aymeric Augustin for the review.
Backport of c91667338 from master.
 2012-12-08 11:16:03 +01:00
Andreas Hug 67bddc0b7b [1.5.x] Fixed #18574 -- Make BaseFormSet.is_valid call its underlying forms' is_valid 
Thanks Simon Charette for the report and the initial patch.
Backport of 66dfcc10b from master.
 2012-12-06 20:05:16 +01:00
Claude Paroz e9301ae451 [1.5.x] Fixed #19367 -- Fixed saving ContentFile in filesystem storage 
This was not working properly when ContentFile was initialized with
an unicode string.
Thanks Alexey Boriskin for the report and the test.

Backport of 34dcf51e06 from master.
 2012-12-06 17:19:35 +01:00
Marc Aymerich 57a41d985a [1.5.x] Fixed #19429 -- Applied linebreaksbr to read-only fields in inlines 
Applied to inlines what ec9d6b1122 did for main fieldsets.
Backport of 553838a28 from master.
 2012-12-06 09:54:47 +01:00
Ramiro Morales 6a098aa6f2 [1.5.x] Fixed #18697 -- Made values accepted for two customizable admin templates consistent. 
Thanks and at cloverfastfood dot com for the report.

b64d30405a from master.
 2012-12-04 19:53:52 -03:00
Anssi Kääriäinen 8c099ec3ec [1.5.x] Fixed #19391 -- Oracle specific failure in tests 
The failure was caused by using None as a choice for a CharField. To
avoid Oracle's "" <-> NULL handling the field type was changed to
IntegerField.

Backpatch of 632cf32b43
 2012-12-04 23:00:17 +02:00
Julien Phalip db455d6ff9 [1.5.x] Fixed the admin_filters tests for Postgres. 
Backport of c196e01100
 2012-12-04 10:39:49 -08:00
Claude Paroz 7fea7cf5d7 [1.5.x] Fixed #19378 -- Ensured get_success_url returns a non-lazy URL 
Backport of 795ac7deda from master.
 2012-12-04 13:24:04 +01:00
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 88e1715639
 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 [6ebf115206]
 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 29d59a879e
 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 ae206d78f6
 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 dc569c8801
 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 c8985a8a73.
 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 0a0a0d66b3
 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 a27582484c
 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 8fb7a90026. 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 f824a95177)
 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