mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
13,362 Commits 30 Branches 460 Tags
a8045c3af2ad9da7332dadfc011bcaf50365dc7d
Commit Graph

13362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniele Procida
a8045c3af2 [1.5.x] Amended explanation of LOCALE_PATHS setting. 
Thanks Daniele Procida for the patch.

37abad73d6 from master.
 2012-12-04 20:20:35 -03: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
Ramiro Morales
b6f67bd50e [1.5.x] Minor idiomatic and docstring edits in ar localflavor. 
45f00dbb93 from master.
 2012-12-04 19:50:19 -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
ae549cc1dd Fixed #19015 -- Removed ISO formats from localized formats.py 
ISO formats are automatically appended to the list of input
formats. Kept only when it is specified in first position, as it
has a special meaning in localize_input.
Thanks Bojan Mihelac for the report.

Backport of 90d3af380 from master.
 2012-12-01 14:15:55 +01:00
Claude Paroz
676e4d5497 [1.5.x] Fixed #19349 -- Fixed re-rendering of ReadOnlyPasswordHashWidget 
Thanks tim.bowden at mapforge.com.au for the report, Andreas Hug
for the patch and Anton Baklanov for the review.
Backport of a0cd6dd11 from master.
 2012-12-01 12:23:49 +01:00
Tim Graham
88638ddd3d [1.5.X] Fixed #19400 - Typo in docs/topics/auth.txt 
Backport of 008e625c66 from master
 2012-11-30 15:13:51 -05:00
Ryan Kaskel
0fc5878c5f [1.5.x] Allow custom User models to use the UserAdmin's change password view. 
Backport of bfdedb687a.
 2012-11-30 16:24:51 +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
Aymeric Augustin
83df1f3b57 [1.5.x] Fixed #19356 -- Increased session key entropy. 
Backport of d913a8b from master.
 2012-11-29 16:38:09 +01:00
Bruno Renié
fe55052cca [1.5.x] Fixed typo in the 1.5* release notes. Thanks brutasse. 2012-11-28 20:45:10 -03:00
Ramiro Morales
bb6e661e0e [1.5.x] Fixed a comment typo. 2012-11-28 20:42:00 -03:00
Anssi Kääriäinen
e3ea668b47 [1.5.x] Fixed #14694 again -- Made defer() works with reverse relations 
Master and stable/1.5.x had diverged in models/query.py.
 2012-11-28 23:56:03 +02:00
Anssi Kääriäinen
957de74ebe [1.5.x] Converted a couple of assertEquals -> assertEqual 2012-11-28 23:55:47 +02:00
Claude Paroz
89593048e2 [1.5.x] Fixed #19366 -- Prevented GEOSIndexError when comparing geometries 
Thanks Craig de Stigter for the report and collaboration on the
patch.
Backport of cc3c4a9d5 from master.
 2012-11-28 22:34:43 +01: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
Jason Yan
54ce0ff7ba [1.5.x] Fixed #19374 -- Typo in docs/ref/models/instances.txt. 
Backport of eeaab083f from master.
 2012-11-28 09:28:21 +01:00
Tim Graham
ecf292aa2c [1.5.X] Fixed #19239 - Added examples for generic date views 
Thank-you Daniel Greenfeld and Scott Nixon.

Backport of 38055222bd from master
 2012-11-27 19:30:44 -05:00
Tim Graham
931b0f8ccd [1.5.X] Fixed #19352 - Added an example in the QuerySet docs. 
Thanks colinkeenan for the suggestion.

Backport of ba2adc9c05 from master
 2012-11-27 18:22:49 -05:00
James Bennett
1c05619c1f [1.5.x] Bump version numbers for 1.5 beta 1. 1.5b1 2012-11-27 16:09:10 -06:00
Jacob Kaplan-Moss
212214e892 Fixed a couple of typos in the 1.5 (and beta) release notes. 
Backport of [7cea123bde] from master.
 2012-11-27 15:58:16 -06:00
Jacob Kaplan-Moss
28120a9436 Added 1.5 beta release notes. 
Backport of [7a62339f59] from master.
 2012-11-27 15:57:40 -06: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
Anssi Kääriäinen
4467d86b61 [1.5.x] Removed duplicate opts.pk_index() method 
Backpatch of [d37483c533]
 2012-11-27 21:59:03 +02:00
Aymeric Augustin
71e5ad248e [1.5.x] Fixed #19362 -- Detected invalid use of @python_2_unicode_compatible. 
Thanks m3wolf for the report and akaariai for reproducing the problem.

Backport of 2ea80b9.
 2012-11-27 09:55:26 +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
Aymeric Augustin
72231610b3 [1.5.x] Fixed two typos. 
Backport of f89901d from master.
 2012-11-25 19:32:25 +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
Julien Phalip
2e5b725197 [1.5.x] Fixed #19355 -- Improved LiveServerThread's handling of exceptions. Thanks to flub for the report. 
Backport of 612357f8ef
 2012-11-25 12:57:14 +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
Vladimír Macek
a12db81135 [1.5.x] Fixed #19293 -- Updated Czech input formats 
Thanks vzima for the report.
Backport of abd0e76d2 from master.
 2012-11-24 21:33:59 +01:00
Jonatan Heyman
75bc081b91 [1.5.x] Fixed #18722 -- Adjusted width of sortable columns in admin 
Thanks Simon Charette for the report.
Backport of 35a0fff2 from master.
 2012-11-24 17:15:03 +01:00
Claude Paroz
fc570b1415 [1.5.x] Updated User manager when testing custom AUTH_USER_MODEL 
This is giving more real test conditions when AUTH_USER_MODEL is
set with override_settings.
Backport of a962bc7c4 from master.
 2012-11-24 16:01:10 +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
Aymeric Augustin
a708b8fcbe [1.5.x] Fixed #19343 -- Deadlock with TransactionTestCase + TEST_MIRROR + multi_db. 
Thanks Jeremy Dunck for the review.

Backport of be64dd3 from master.
 2012-11-24 09:49:07 +01:00
Russell Keith-Magee
8e8f1ddf57 [1.5.x] Removed some stray debug lines introduced accidentally in c8985a8. 
Backport of f2d8004.
 2012-11-24 15:27:09 +08: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
24582f18ff [1.5.x] Fixed #19218 -- Added documentation note on limitations of signals with custom User models. 
Thanks to kunitoki@gmail.com for the report.

Backport of fdb5c98d7e.
 2012-11-24 14:27:11 +08:00