Jannis Leidel
3047981517
Fixed #18050 -- Fixed a rather glaring bug in the handling of @import statements when using the cached staticfiles storage.
2012-07-08 18:17:53 +02:00
Jannis Leidel
effc2cad95
Merge branch 'master' of github.com:django/django
2012-07-08 12:57:04 +02:00
Jannis Leidel
3727f6d096
Fixed #18430 -- Use the FILE_CHARSET setting when reading from a file during post processing with the cached staticfiles storage. Thanks to Brant Young for initial debugging.
2012-07-08 12:56:49 +02:00
Aymeric Augustin
5e94ef293c
Fixed #18374 -- Explained "corrupt image" error
...
Thanks fabian and charettes.
2012-07-08 11:53:45 +02:00
Julien Phalip
8015593bc1
Fixed #17978 -- Fixed a minor layout issue when an inline contains a filter horizontal widget. Thanks to Aymeric Augustin for the report.
2012-07-07 15:41:04 -07:00
Claude Paroz
249c445446
Fixed #18164 -- Precised startapp template context content
2012-07-07 23:08:43 +02:00
Aymeric Augustin
d94cfdcfae
Fixed #18589 -- Typo in generic CBV docs.
...
Thanks cpthomas for the report.
2012-07-07 17:42:04 +02:00
Aymeric Augustin
bbc590697a
Removed Django 1.0-specific sections.
2012-07-07 16:44:55 +02:00
Aymeric Augustin
29ca3d3c4b
Fixed #18587 -- Typo in management command example
...
Thanks Frank Wiles.
2012-07-07 16:00:03 +02:00
Florian Apolloner
a4bb7dd552
Merge branch 'master' of github.com:django/django
2012-07-07 15:49:00 +02:00
Jannis Leidel
0a68a2994b
Fixed #18254 -- Added ability to the static template tags to store the result in a contextt variable. Many thanks to Andrei Antoukh for the initial patch.
2012-07-07 15:30:25 +02:00
Florian Apolloner
52a9e15794
Fixed a regression in the user admin page introduced in a92e7f37c4
.
...
a92e7f37c4
switched most of the internal stuff
to format_html. Using format_html in the `render` method of
`ReadOnlyPasswordHashWidget` caused it to generate `SafeString` instances.
Later these safe strings where returned from `BoundField.__unicode__` which
caused force_unicode to loose the "safe" information. This commit fixes that by
ensuring that the render method returns `SafeUnicode` instead of `SafeString`.
2012-07-07 15:29:20 +02:00
Claude Paroz
8dafd04c45
Fixed #17257 - Removed outdated comment in syndication view
...
Thanks krzysiumed for the patch.
2012-07-07 11:34:04 +02:00
Adrian Holovaty
8855f9380e
Merge pull request #176 from benspaulding/ticket_18521
...
Add reST role to templates named in some view docs.
2012-07-06 12:46:26 -07:00
Adrian Holovaty
70ac570157
Merge pull request #183 from rpedigoni/master
...
Fixed typo in 1.5 release notes
2012-07-06 12:45:05 -07:00
Adrian Holovaty
4e8084a4cb
Merge pull request #187 from evildmp/docs_typos
...
Added a missing \ in uwsgi docs. Thanks, evildmp.
2012-07-06 12:44:34 -07:00
Adrian Holovaty
7151fbd078
Merge pull request #188 from semente/patch-1
...
Fixed copyright holder in baseconf.py.
2012-07-06 12:42:55 -07:00
Guilherme Gondim
91e4f7effb
Fix copyright holder
2012-07-06 15:24:07 -03:00
Luke Plant
2ba4278cb3
Fixed #18484 - 'display:none' on CSRF token div is redundant and causes problems with some browsers
...
Thanks to hedleyroos for the report
2012-07-06 15:33:29 +01:00
Claude Paroz
4c417cc9eb
Fixed #18576 -- Added missing import in tutorial02
...
Thanks jaaruiz at yahoo.com for the report.
2012-07-06 13:58:49 +02:00
Claude Paroz
86eb606b88
Used skipIf decorator to skip image tests when PIL is not available
2012-07-06 11:20:07 +02:00
Daniele Procida
83da36ebfb
restored a missing \ in uwsgi docs
2012-07-06 10:10:27 +01:00
Luke Plant
8fdc56d2a6
Fixed #18572 - Python26 string format incompatibility
...
Thanks to anonymous/AeroNotix for the report
2012-07-06 00:23:02 +01:00
Anssi Kääriäinen
d3c2eb103f
Fixed #18330 - Made cache culling 3rd party db backend friendly
...
This is Ian Kelly's patch from #15580 with minor modifications.
2012-07-05 17:20:48 +03:00
Andrei Antoukh
0f49b2bce2
Fixed #18362 - Made model.save() update_fields accept attnames
2012-07-05 16:43:28 +03:00
Tim Graham
e4a1407a9c
Fixed #17997 - Documented that the debug server is now multithreaded by default.
...
Thanks trey.smith@ for the report and vanessagomes for the patch.
2012-07-05 08:39:05 -04:00
Renato Pedigoni
3caf53524c
fixed typo
2012-07-04 18:34:55 -03:00
Luke Plant
a222d6e800
Fixed incorrect URL to object on delete confirmation and history page
2012-07-03 22:20:12 +01:00
Luke Plant
b0eee0ba4b
Removed various unnecessary instances of mark_safe applied to URLs
...
Also fixed some test breakages introduced in last commit
2012-07-03 22:20:12 +01:00
Luke Plant
a92e7f37c4
Changed a lot of internal code to use 'format_html' where appropriate/possible
2012-07-03 22:20:12 +01:00
Luke Plant
bee498f3a2
Added 'format_html' utility for formatting HTML fragments safely
2012-07-03 22:20:12 +01:00
Luke Plant
f33e150369
Documented utils.html.escape and conditional_escape
2012-07-03 22:20:12 +01:00
Claude Paroz
cf731a543e
Fixed widget parent class in generic_relations test
2012-07-03 11:57:15 +02:00
Anssi Kääriäinen
ab7f071058
Fixed comment wording in sql/where.py
...
Thanks to Simon Charette for noticing this.
2012-07-03 10:31:06 +03:00
Anssi Kääriäinen
925a6936b9
Stylistic cleanup of Postgres autocommit tests
...
Cleaned up tests introduced in f572ee0c65
.
Thanks to Claude Paroz for suggesting the changes.
2012-07-03 10:22:13 +03:00
Claude Paroz
784d0c261c
Replaced 'return' by 'raise' in custom model field docs
...
Thanks Simon Charette for noticing it. Refs #11162 .
2012-07-02 10:16:42 +02:00
Julien Phalip
2cd4cf58d3
Fixed #18550 -- Ensured that the admin history view works with escaped primary keys.
...
Thanks to josh.oosterman for the report and patch.
2012-07-01 18:40:50 -07:00
Tim Graham
7313468f85
Fixed #17436 - Added warning about overriding Model.__init__()
...
Thanks zsiciarz for the draft patch.
2012-07-01 18:04:16 -04:00
Anssi Kääriäinen
e74787391e
Fixed a regression introduced in where.as_sql() refactor
...
At least Oracle needs parentheses in negated where conditions, even if
there is only single condition negated. Fixed this by reverting to old
logic in that part of as_sql() and adding a comment about this.
I did not investigate why the parentheses are needed. The original
offending commit was bd283aa844
.
2012-07-01 22:52:35 +03:00
Anssi Kääriäinen
f572ee0c65
Fixed #16047 -- Restore autocommit state correctly on psycopg2
...
When the postgresql_psycopg2 backend was used with DB-level autocommit
mode enabled, after entering transaction management and then leaving
it, the isolation level was never set back to autocommit mode.
Thanks brodie for report and working on this issue.
2012-07-01 19:36:43 +03:00
Anssi Kääriäinen
da573fbb41
Fixed some locations to work with autocommit=True
...
- backends: supports_transactions()
- select_for_update tests
2012-07-01 19:27:36 +03:00
Anssi Kääriäinen
bd283aa844
Refactored the empty/full result logic in WhereNode.as_sql()
...
Made sure the WhereNode.as_sql() handles various EmptyResultSet and
FullResultSet conditions correctly. Also, got rid of the FullResultSet
exception class. It is now represented by '', [] return value in the
as_sql() methods.
2012-07-01 17:21:34 +03:00
Anssi Kääriäinen
2b9fb2e644
Fixed #18251 -- Removed a deadlock possibility in apploading
...
Thanks to harm for the report and comments.
2012-07-01 16:14:27 +03:00
Tim Graham
9974069620
Fixed #16882 - Clarified why one should not use 'init_command' after initial database creation.
2012-07-01 07:25:24 -04:00
Tim Graham
c68f4c514c
Fixed #18493 - Added instructions to locate the Django source files to the t
...
Thanks Claude Paroz for the draft patch.
2012-07-01 06:55:46 -04:00
Tim Graham
c5fb8299ef
Fixed #17705 - Updated TabularInline image and doc in tutorial 2.
...
Thanks xbito for the draft patch.
2012-06-30 18:20:34 -04:00
Raúl Cumplido
55ffcf8e7b
Fixed #18145 -- Improved documentation of unique_together type fields
2012-06-30 17:16:40 -04:00
Claude Paroz
03896eb5df
Fixed #17026 -- Improved wording of contrib.messages' storage backends section
2012-06-30 22:21:23 +02:00
Claude Paroz
da200c5e35
Fixed #16519 -- Deprecated mimetype kwarg of HttpResponse __init__
...
This keyword was already deprecated in the code (supported for
backwards compatibility only), but never formally deprecated.
Thanks Paul McMillan for the report and yasar11732 for the initial
patch.
2012-06-30 21:27:47 +02:00
Claude Paroz
deed192dda
Removed usage of mimetype kwarg of HttpResponse
...
Refs #16519 .
2012-06-30 21:19:07 +02:00