mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 02:56:25 +00:00
Code Issues 25 Releases Wiki Activity
13,633 Commits 28 Branches 426 Tags 667 MiB
6045efa029
Commit Graph

13633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aymeric Augustin
e18968e0f2 Merge pull request #518 from vanschelven/patch-1 
Fixed interpolation in a translated string.

Refs #14678.
 2012-11-25 11:59:34 -08:00
Julien Phalip
ae206d78f6 Fixed #17646 -- Added a get_list_filter() method to ModelAdmin. Thanks to rasca for the suggestion and to mateusgondim for the patch. 2012-11-25 20:39:23 +01:00
Claude Paroz
f26b956e80 Fixed test failure following capitalization fix in 2f035a972 2012-11-25 19:54:38 +01:00
Aymeric Augustin
7644800070 Change exception type to reduce confusion. 
TemplateSyntaxError is expected at compile time, not at run time.

Refs #19280.
 2012-11-25 19:51:42 +01:00
Aymeric Augustin
f89901dc05 Fixed two typos. 2012-11-25 19:31:53 +01:00
Claude Paroz
a5d47415f4 Enabled SimpleTestCase to be decorated by override_settings 
Refs #18417. Also fixed some test case classes which subclassed
the wrong parent.
 2012-11-25 19:06:17 +01:00
Claude Paroz
9f7cefd505 Fixed #18417 -- Raised exception when unittest.TestCase is decorated with override_settings 2012-11-25 19:06:17 +01:00
Ramiro Morales
f3a0ecc9ee Changed (again) technique to get version IDs shown in docs from source code. 
Hopefully it will fix the problem with the documentation building server
that caused a wrong Django version to be reported in the HTML zipball
docs edition.

Follow-up to commits 373df56 and 0b98ef6.
 2012-11-25 11:58:06 -03:00
Julien Phalip
612357f8ef Fixed #19355 -- Improved LiveServerThread's handling of exceptions. Thanks to flub for the report. 2012-11-25 12:55:23 +01:00
Aymeric Augustin
9d7130e066 Merge pull request #554 from zedr/master 
Minor spelling error in a docstring
 2012-11-24 13:47:09 -08:00
Aymeric Augustin
d266919584 Fixed #19280 -- Raised an explicit exception for the old {% url %} syntax. 2012-11-24 22:10:51 +01:00
Aymeric Augustin
690cac3a34 Used a django.test.TestCase for compatibility with @override_settings. 
These tests were silently skipped.
 2012-11-24 22:10:51 +01:00
Vladimír Macek
abd0e76d2d Fixed #19293 -- Updated Czech input formats 
Thanks vzima for the report.
 2012-11-24 19:18:54 +01:00
Claude Paroz
44815bad6b Removed obsolete contrib.comments upgrade guide 
The old comment system was pre-1.0.
 2012-11-24 18:10:51 +01:00
Jonatan Heyman
35a0fff28a Fixed #18722 -- Adjusted width of sortable columns in admin 
Thanks Simon Charette for the report.
 2012-11-24 17:12:59 +01:00
Claude Paroz
a962bc7c45 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.
 2012-11-24 16:00:00 +01:00
Anssi Kääriäinen
08b4a22293 Updated stale docstring of setup_joins 2012-11-24 16:26:05 +02:00
Anssi Kääriäinen
dc569c8801 Fixed ordering-related failure in m2m_through_regress tests 2012-11-24 16:03:21 +02:00
Chris Khoo
bf1871d874 Fixed #19237 -- Improved strip_tags utility 
The previous pattern didn't properly addressed cases where '>'
was present inside quoted tag content.
 2012-11-24 12:16:52 +01:00
Aymeric Augustin
be64dd35fb Fixed #19343 -- Deadlock with TransactionTestCase + TEST_MIRROR + multi_db. 
Thanks Jeremy Dunck for the review.
 2012-11-24 09:48:21 +01:00
Russell Keith-Magee
f2d8004967 Removed some stray debug lines introduced accidentally in c8985a8. 2012-11-24 15:26:36 +08:00
Russell Keith-Magee
18d7c1ea3a 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.
 2012-11-24 15:07:50 +08:00
Russell Keith-Magee
fdb5c98d7e Fixed #19218 -- Added documentation note on limitations of signals with custom User models. 
Thanks to kunitoki@gmail.com for the report.
 2012-11-24 13:53:44 +08:00
Russell Keith-Magee
c8985a8a73 Fixed #19806 -- Ensure that content types and permissions aren't created for swapped models. 
Thanks to rizumu for the report.
 2012-11-24 13:43:20 +08:00
Anssi Kääriäinen
0a0a0d66b3 Fixed #19351 -- SQLite bulk_insert of more than 500 single-field objs 2012-11-24 01:13:12 +02:00
Anssi Kääriäinen
a27582484c 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
 2012-11-24 01:12:17 +02:00
Aymeric Augustin
5c81e9de0f Negligible style fix in docs. 2012-11-23 20:40:42 +01:00
Anssi Kääriäinen
90b86291d0 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.
 2012-11-23 19:53:04 +02:00
Claude Paroz
7b9a1fb964 Fixed cursor commit command in PostGIS backend 
Thanks Bruno Renié for noticing the error.
 2012-11-23 17:20:36 +01:00
Rigel Di Scala
2bca9a4eda Fix spelling error in the docstring 2012-11-23 16:20:18 +00:00
Flavio Curella
fbd1df8e16 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.
 2012-11-23 16:06:31 +01:00
Tim Graham
9d4baf80c6 Merge pull request #549 from WoLpH/master 
Changed an if statement in the docs to a slightly cleaner variant.
 2012-11-23 04:12:54 -08:00
Tim Graham
63e6cd1bb3 Fixed #19348 - Clarified the units of filesizeformat. 
Thanks george_edison for the report and Claude Paroz for the patch.
 2012-11-23 07:00:08 -05:00
Aymeric Augustin
2875b5dcab 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.
 2012-11-23 10:02:18 +01:00
Tim Graham
c13912ac7f Fixed #19346 - Typo in docs/ref/contrib/gis/install/index.txt 2012-11-22 18:01:20 -05:00
Tim Graham
e94f8babc2 Spell checked 1.5 alpha release notes 2012-11-22 17:16:04 -05:00
WoLpH
eabb44417c changed if statement to a slightly cleaner/less confusing variant 2012-11-22 22:29:39 +01:00
Tim Graham
0e3690d230 Fixed #18974 - Warned against using models.permalink 
Thanks dstufft for the draft patch.
 2012-11-22 16:08:51 -05:00
Aymeric Augustin
891c530624 Fixed #18984 -- Avoided a deadlock in test teardown. 
Thanks Jeremy Dunck for the report.
 2012-11-22 20:55:50 +01:00
Aymeric Augustin
a026e480da Fixed #16039 -- Made post_syncdb handlers multi-db aware. 
Also reverted 8fb7a90026. Refs #17055.
 2012-11-22 20:53:59 +01:00
George Hickman
ea6b95dbec Fixed #19316 -- Set View args/kwargs/request before dispatch 2012-11-22 20:13:01 +01:00
Tim Graham
71a3162a70 Documented behavior of get_or_create when multiple objects are returned. 
Thanks Matt Lauber for the patch.
 2012-11-22 10:36:18 -05:00
Aymeric Augustin
9e11253497 Merge pull request #511 from ryankask/username-password-admin 
Allowed custom User models to use the UserAdmin's change password view.

Fix #19056 (again).
 2012-11-22 06:50:37 -08:00
Tim Graham
7b2d95eb30 Clarified usage of as_view kwargs for setting arguments on class based views 
Thanks Dave McLain for the patch.
 2012-11-22 09:07:21 -05:00
Tim Graham
3587991ba8 Fixed #19317 - Added an image for warning blocks in the docs 
Thanks tome for the suggestion and patch.
 2012-11-22 06:34:15 -05:00
Jannis Leidel
3fb83729b9 Merge branch 'ticket_19325' of https://github.com/hannesstruss/django into hannesstruss-ticket_19325 2012-11-22 10:05:08 +01:00
Preston Holmes
d80d05fc67 Added examples of using startproject/app with URLs 
thanks to Brent O'Connor for the idea and intial docs
 2012-11-21 22:06:59 -08:00
shepdl
8e5573e99a Fixed #19243 - Edited GeoDjango Tutorial for consistency and style. 2012-11-21 19:31:17 -05:00
Tim Graham
e2b1808196 Fixed #19335 - Typo and cleanups in docs/topics/class-based-views/index.txt 2012-11-21 19:06:17 -05:00
Julien Phalip
978d4476cf 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:19:00 +01:00