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

13565 Commits

Author SHA1 Message Date
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
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
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 #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
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 #18375 -- 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 90b86291d0
 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 #19152 -- 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 #19348 - 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 #16426, #16039.

Backport of 2875b5d from master.
 2012-11-23 10:19:09 +01:00
Tim Graham 918d020de2 [1.5.X] Fixed #19346 - 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
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 b9f9bc9a17 [1.5.x] Fixed #18984 -- Avoided a deadlock in test teardown. 
Thanks Jeremy Dunck for the report.

Backport of 891c530 from master.
 2012-11-22 20:56:41 +01: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
Tim Graham 84dc6afac7 [1.5.X] Documented behavior of get_or_create when multiple objects are returned. 
Thanks Matt Lauber for the patch.

Backport of 71a3162a70 from master
 2012-11-22 10:37:17 -05:00
Tim Graham 63546533c1 [1.5.X] Clarified usage of as_view kwargs for setting arguments on class based views 
Thanks Dave McLain for the patch.

Backport of 7b2d95eb30 from master
 2012-11-22 09:08:37 -05:00
Tim Graham 74e22f9772 [1.5.X] Fixed #19317 - Added an image for warning blocks in the docs 
Thanks tome for the suggestion and patch.

Backport of 3587991ba8 from master
 2012-11-22 08:47:52 -05:00
Preston Holmes 6d85f1212f [1.5.x] Added examples of using startproject/app with URLs 
thanks to Brent O'Connor for the idea and intial docs
 2012-11-21 22:08:04 -08:00
shepdl 187441602c [1.5.X] Fixed #19243 - Edited GeoDjango Tutorial for consistency and style. 
Backport of 8e5573e99a from master
 2012-11-21 19:32:27 -05:00
Tim Graham 6d13071021 [1.5.X] Fixed #19335 - Typo and cleanups in docs/topics/class-based-views/index.txt 
Backport of e2b1808196 from master
 2012-11-21 19:07:36 -05:00
Julien Phalip 49484b54bc [1.5.x] Fixed #18920 -- Added `.gitattributes` to normalize line endings in HTML templates and avoid spurious failures in the core test suite on Windows. Many thanks to manfre, Claude Paroz, Karen Tracey, MaxV and Daniel Langer for their advising and testing. 2012-11-21 10:20:02 +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
Ramiro Morales 1220f22b88 [1.5.x] Fixed #19331 (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 8fdb28219d 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 a32f30c79c from master
 2012-11-20 23:06:38 +00:00
Claude Paroz e15df5b6b5 [1.5.x] Fixed #19331 -- 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 #18658 -- 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 #19306 - 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 #19308 - 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 #13997 - 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 #19315 -- 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 #19291 -- 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 3f2fc2f41a)
 2012-11-17 21:31:21 +01:00
Tom Christie 2fdb7e6ca5 [1.5.x] Include `versionadded 1.5` directive 
(cherry picked from commit 5bc6929f9a)
 2012-11-17 21:31:07 +01: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
Tom Christie 2bfea36208 [1.5.x] Add 'page_kwarg' attribute to `MultipleObjectMixin`, removing hardcoded 'page'. 
(cherry picked from commit 502be865c6)
 2012-11-17 21:30:22 +01:00
Kent Hauser 94208399d9 [1.5.x] Add `form` to formwizard context (includes tests) 
Backport of ba81164fb7 from master.
 2012-11-17 21:24:19 +01:00
Tim Graham 04adb7626b [1.5.X] Fixed #16779 - 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 #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