mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-14 19:30:46 +00:00
Code Issues 32 Releases Wiki Activity
13,823 Commits 29 Branches 437 Tags
Commit Graph

8440 Commits

Author SHA1 Message Date
Anssi Kääriäinen
a0155f3534 [1.5.x] Refactored proxy model skipping in get_default_columns() 
The refactoring allows custom subclasses to use different default
columns than the base model.
 2012-12-21 20:56:04 +02:00
Claude Paroz
9e7183073f [1.5.x] Added compatibility with legacy message length 
Added compatibility code to not break when decoding messages
encoded on pre-1.5 versions.
Refs #19387. Thanks Florian Apolloner for noticing the issue.
 2012-12-21 13:36:22 +01:00
Claude Paroz
be10289d03 [1.5.x] Fixed #19387 -- Preserved SafeData status in contrib.messages 
Thanks Anton Baklanov for the report and the patch.
Backport of e277301c2 from master.
 2012-12-21 10:10:21 +01:00
Russell Keith-Magee
b7607003a5 [1.5.x] Fixed #19401 -- Ensure that swappable model references are case insensitive. 
This is necessary because get_model() checks are case insensitive, and if the swapable check isn't, the
swappable logic gets tied up in knots with models that are partially swapped out.

Thanks to chris@cogdon.org for the report and extensive analysis, and Preston for his work on the draft patch.

Backport of c04c03d from trunk.
 2012-12-20 16:14:10 +08:00
Patryk Zawadzki
9892919b0d [1.5.x] Fixed #18172 -- Made models with __iter__ usable in ModelMultipleChoiceField 
Thanks to Patryk Zawadzki for the patch.

Backpatch of 3989ce52ef78840eefe01541628daa220191c0ad
 2012-12-19 22:56:19 +02:00
Tim Graham
034c355118 [1.5.X] Fixed #19470 - Clarified widthratio example. 
Thanks orblivion for the suggestion.

Backport of 6534a95ac3 from master
 2012-12-18 08:20:51 -05:00
Claude Paroz
ddea0e0d7e [1.5.x] Fixed #19441 -- Created PostgreSQL varchar index when unique=True 
Thanks Dylan Verheul for the report and Anssi Kääriäinen for the
review.
Backport of 55972ee5c from master.
 2012-12-18 10:04:47 +01:00
Anssi Kääriäinen
1caa483914 [1.5.x] Fixed #19197 -- fixed convert_values() for nullable numeric fields 
Cleaned up the implementation of base convert_values() a little, and
made sure it accepts None as a value for numeric fields.

There are no tests attached. The reason is that not all of the
convert_values() accept None as a value for numeric fields (for example
sqlite3.convert_values()).

The reason the base convert_values() needs to accept None is that this
situation might arise in custom compilers for 3rd party backends. It
is easy to keep the convert_values() working, so lets do that.

Backpatch of 12a96bfa263d514884ef11009913b2f8bb163472
 2012-12-17 00:09:05 +02:00
Claude Paroz
0bbc7c2b49 [1.5.x] Fixed #19483 -- Improved import error message in contrib.comments 
Thanks Valentin Lorentz for the report and the suggested fix.
Backport of ed711c4bd from master.
 2012-12-16 21:13:30 +01:00
Tim Graham
53b40d75b7 [1.5.X] Fixed #18718 - Documented django.utils.encoding.filepath_to_uri 
Backport of 507c081484 from master
 2012-12-16 14:40:10 -05:00
Russell Keith-Magee
06b5f5fcb6 [1.5.X] Corrected tests depending on the error message on the AuthenticationForm. 
Refs #19368, and the fix introduced in 27f8129d64292868f6a328f7bf9a1bed67967ff3.

Backport of 9facca28b619ad94680cf07774ee7a377034ca42 from trunk.
 2012-12-16 07:22:25 +08:00
Claude Paroz
55aae4b863 Updated translation catalog for contrib.auth 2012-12-15 23:27:55 +01:00
Russell Keith-Magee
9534192c10 [1.5.X] Fixed #19368 -- Ensured that login error messages adapt to changes in the User model. 
Thanks to un33k for the report.

Backport of 27f8129d64292868f6a328f7bf9a1bed67967ff3 from master.
 2012-12-15 22:48:09 +08:00
Russell Keith-Magee
311bd0055d [1.5.X} Fixed #19412 -- Added PermissionsMixin to the auth.User heirarchy. 
This makes it easier to make a ModelBackend-compliant (with regards to
permissions) User model.

Thanks to cdestigter for the report about the relationship between
ModelBackend and permissions, and to the many users on django-dev that
contributed to the discussion about mixins.

Backport of 47e1df896b17aaaa97b73ef64010a7df4ea3d8d6 from master.
 2012-12-15 22:47:48 +08:00
Aymeric Augustin
44e56238d7 [1.5.x] Fixed #2304 -- Documented TRANSACTIONS_MANAGED. 
Backport of a001f3c.
 2012-12-14 21:16:04 +01:00
Claude Paroz
c20c3a20a3 [1.5.x] Fixed #19432 -- Provided better error message for get_object_or_404 
Thanks Kit Sunde for the report and Brian Holdefehr for the initial
patch.
Backport of 6ed6a18a0 from master.
 2012-12-12 22:05:49 +01:00
James Bennett
82d4786544 [1.5.x] Bump version numbers for security release. 2012-12-10 15:49:48 -06:00
Florian Apolloner
77b06e4151 [1.5.X] Fixed a security issue in get_host. 
Full disclosure and new release forthcoming.
 2012-12-10 22:13:28 +01:00
Florian Apolloner
fce1fa0f7f [1.5.X] Fixed #18856 -- Ensured that redirects can't be poisoned by malicious users. 2012-12-10 22:13:28 +01:00
Aymeric Augustin
d6bad2e9ea [1.5.x] Fixed #19392 -- Improved error for old-style url tags with dashes. 
Thanks dloewenherz for the report.

Backport of 4951932 from master.
 2012-12-09 16:18:52 +01:00
Claude Paroz
a155fb7408 [1.5.x] Fixed #19439 -- Removed unused template tag library in change_password.html 
Thanks ppetrid for the report.
Backport of 35492f8fc from master.
 2012-12-08 12:54:22 +01:00
Claude Paroz
fa54604606 [1.5.x] Fixed #19423 -- Prevented ModelAdmin sharing widgets due to formfield_overrides 
Thanks joebuyer at manycycles.com for the report and Simon Charette
for the review.
Backport of 04e6542b5 from master.
 2012-12-08 12:47:33 +01:00
Claude Paroz
9af9cdb3eb [1.5.x] Fixed a string detection in ogrinspect.py 
Backport of 61407951 from master.
 2012-12-08 12:20:48 +01:00
Claude Paroz
4214a22e06 [1.5.x] Fixed #19357 -- Allow non-ASCII chars in filesystem paths 
Thanks kujiu for the report and Aymeric Augustin for the review.
Backport of c91667338 from master.
 2012-12-08 11:16:03 +01:00
Andreas Hug
67bddc0b7b [1.5.x] Fixed #18574 -- Make BaseFormSet.is_valid call its underlying forms' is_valid 
Thanks Simon Charette for the report and the initial patch.
Backport of 66dfcc10b from master.
 2012-12-06 20:05:16 +01:00
Claude Paroz
e9301ae451 [1.5.x] Fixed #19367 -- Fixed saving ContentFile in filesystem storage 
This was not working properly when ContentFile was initialized with
an unicode string.
Thanks Alexey Boriskin for the report and the test.

Backport of 34dcf51e06 from master.
 2012-12-06 17:19:35 +01:00
Marc Aymerich
57a41d985a [1.5.x] Fixed #19429 -- Applied linebreaksbr to read-only fields in inlines 
Applied to inlines what ec9d6b1122d did for main fieldsets.
Backport of 553838a28 from master.
 2012-12-06 09:54:47 +01: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.

b64d30405a3d5468dc8c6232747d45bbeee4f7bb from master.
 2012-12-04 19:53:52 -03:00
Ramiro Morales
b6f67bd50e [1.5.x] Minor idiomatic and docstring edits in ar localflavor. 
45f00dbb93a0e929f4320b9c652fef51655e6872 from master.
 2012-12-04 19:50:19 -03: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 88e17156393b
 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
Ryan Kaskel
0fc5878c5f [1.5.x] Allow custom User models to use the UserAdmin's change password view. 
Backport of bfdedb687abfbdf400387092762bb7081e8e8b56.
 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
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
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 [6ebf115206289bce8f3d86318871faac13d6e835]
 2012-11-28 18:25:34 +02:00
James Bennett
1c05619c1f [1.5.x] Bump version numbers for 1.5 beta 1. 2012-11-27 16:09:10 -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 [d37483c533868e78afd0ca3faf993fee97097f9f]
 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 29d59a879ea5b116
 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 ae206d78f6d991e
 2012-11-25 20:43:18 +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