mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-20 06:10:46 +00:00
Code Issues32 Releases Wiki Activity
13,348 Commits 29 Branches 438 Tags
47c5b50d34
Commit Graph

13348 Commits

Author SHA1 Message Date
Claude Paroz
47c5b50d34 [1.5.x] Fixed -- 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 -- 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 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 -- 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 -- 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
Jason Yan
54ce0ff7ba [1.5.x] Fixed -- 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 - 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 - 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 [7cea123bdebd45dc1bafe02d57a90995e76c28a9] from master.
 2012-11-27 15:58:16 -06:00
Jacob Kaplan-Moss
28120a9436 Added 1.5 beta release notes. 
Backport of [7a62339f595f03170903d04cbb3e170fd03c657b] from master.
 2012-11-27 15:57:40 -06:00
Danilo Bargen
5509eb8626 [1.5.x] Fixed -- 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 [d37483c533868e78afd0ca3faf993fee97097f9f]
 2012-11-27 21:59:03 +02:00
Aymeric Augustin
71e5ad248e [1.5.x] Fixed -- 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 -- 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 -- 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 .

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 . 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 -- 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 -- 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 -- 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 -- 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 -- 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 dc569c880143db07e01b3293d698ad8fe4a0136f
 2012-11-24 16:05:30 +02:00
Chris Khoo
9efe1a7210 [1.5.x] Fixed -- 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 -- 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 -- Added documentation note on limitations of signals with custom User models. 
Thanks to kunitoki@gmail.com for the report.

Backport of fdb5c98d7ee54c7f89ec10b0203263f1f5b37510.
 2012-11-24 14:27:11 +08:00
Russell Keith-Magee
3fd8458fb3 [1.5.x] Fixed -- 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
Jeremy Dunck
158a0332bf Changed Luxembourgish name_local to unicode escapes. 
Fixes 6a00c196.
 2012-11-23 19:30:52 -08:00
Anssi Kääriäinen
421e599ad3 [1.5.x] Fixed -- 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 

Backpatch of a27582484cf814554907d2d1ad077852de36963f
 2012-11-24 01:19:17 +02:00
Claude Paroz
6a00c1968b Added new languages 
Afrikaans, Belarusian, Breton, Venezuelan Spanish, Interlingua,
Luxembourgish, Udmurt
 2012-11-23 23:16:15 +01:00
Aymeric Augustin
a79e4521e5 [1.5.x] Negligible style fix in docs. 
Backport of 5c81e9d.
 2012-11-23 20:41:08 +01:00
Anssi Kääriäinen
90c7aa0740 [1.5.x] Fixed -- Removed dict-ordering dependency for F-expressions 
F() expressions reuse joins like any lookup in a .filter() call -
reuse multijoins generated in the same .filter() call else generate
new joins. Also, lookups can now reuse joins generated by F().

This change is backwards incompatible, but it is required to prevent
dict randomization from generating different queries depending on
.filter() kwarg ordering. The new way is also more consistent in how
joins are reused.

Backpatch of 90b86291d022a09031d1df397d7aaebc30e435f7
 2012-11-23 20:07:50 +02:00
Claude Paroz
56f8e4b79c [1.5.x] Fixed cursor commit command in PostGIS backend 
Thanks Bruno Renié for noticing the error.
Backport of 7b9a1fb96 from master.
 2012-11-23 17:23:15 +01:00
Flavio Curella
d46b24e682 [1.5.x] Fixed -- Allowed PostGIS tests to be run without template 
From version 2, a PostGIS template is no longer required to create
a GIS-enabled database.
Backport of fbd1df8e from master.
 2012-11-23 16:07:29 +01:00
WoLpH
f88319dc3c [1.5.X] Changed if statement to a slightly cleaner variant 
Backport of eabb44417c from master
 2012-11-23 07:13:24 -05:00
Tim Graham
c90156fc18 [1.5.X] Fixed - Clarified the units of filesizeformat. 
Thanks george_edison for the report and Claude Paroz for the patch.

Backport of 63e6cd1bb3 from master
 2012-11-23 07:02:29 -05: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 , .

Backport of 2875b5d from master.
 2012-11-23 10:19:09 +01:00
Tim Graham
918d020de2 [1.5.X] Fixed - Typo in docs/ref/contrib/gis/install/index.txt 
Backport of c13912ac7f from master
 2012-11-22 18:02:20 -05:00
Tim Graham
072b9d0d3d [1.5.X] Spell checked 1.5 alpha release notes 
Backport of e94f8babc2 from master
 2012-11-22 17:16:46 -05:00