mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-22 15:20:47 +00:00
Code Issues 32 Releases Wiki Activity
13,506 Commits 29 Branches 438 Tags
Commit Graph

13506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ramiro Morales
470f3eca34 [1.5.x] Added PASSWORD_HASHERS to settings reference document. 
abd0f304b162b3120b1c7321fbfc3090e5f3c92c from master.
 2012-12-19 15:10:39 -03: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
Tim Graham
e11bd5c5ac [1.5.X] Fixed #19442 - Clarified that raw SQL must be committed. 
Thanks startup.canada for the suggestion.

Backport of 31f49f1396 from master
 2012-12-18 08:14:37 -05:00
Tim Graham
2545dc59bf [1.5.x] Fixed #17312 - Warned about database side effects in tests. 
Thanks jcspray for the suggestion.

Backport of 7df03268a467a9aec9c4c574c85317a738ca33ae from master.
 2012-12-18 08:05:12 -05:00
Pablo Recio
6d712e0d66 [1.5.x] Fixed #19430 -- Added 'license' value to setup.py 
Backport of 50fd96497 from master.
 2012-12-18 11:51:34 +01: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
Tim Graham
528483cae2 [1.5.X] Fixed #19279 - Clarified order of database setup and Django install. 
Thanks colinnkeenan for the suggestion.

Backport of 72a6ac568d from master
 2012-12-16 15:46:17 -05: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
Russell Keith-Magee
a7465ee7df [1.5.X] Fixed #19472 -- Documented the testing requirements and tools for custom User models. 
Thanks to gcc for the report.

Backport of bd414aed01d48339ed02b9714565939536ffbfcb from master.
 2012-12-15 22:47:30 +08:00
Russell Keith-Magee
9cf566233b [1.5.X] Fixed #19384 -- Documented the behavior of custom managers on abstract models. 
This documents the behavior introduced by cc337a74, which is BACKWARDS
INCOMPATIBLE for any attempt to invoke a method on a manager using the
abstract class as the calling class (e.g., AbstractBase.objects.do_something())

Thanks to mhsparks for the report.

Backport of 1b646e656e46909af447056b4f98b9744aae4978 from master.
 2012-12-15 22:46:55 +08:00
Tim Graham
084a8e2959 [1.5.X] Fixed #19344 - Documented how to run django-admin in a virtualenv on Windows. 
Thanks Hourann Bosci for the patch.

Backport of 1e5b0fc4d0 from master
 2012-12-15 09:30:46 -05:00
Tim Graham
1af69a240c [1.5.X] Fixed #19342 - Added new tutorials to the 1.5 release notes 
Backport of b594e4923c from master
 2012-12-15 08:30:06 -05:00
Claude Paroz
d196f8f7eb [1.5.X] Removed obsolete contrib.comments upgrade guide 
The old comment system was pre-1.0.

Backport of 44815bad6b from master
 2012-12-15 08:15:16 -05:00
Tim Graham
c252ed567c [1.5.X] Fixed #9962 - Added a testing tutorial. 
Thank-you Daniele Procida for the first draft
and shaibi, Aymeric, and others for the reviews.

Backport of b052e6cc95 from master
 2012-12-15 08:12:25 -05:00
Ben Longden
0c3e4848b6 [1.5.X] Removed PHP references 
Backport of 55a2d5b577 from master
 2012-12-14 19:33:48 -05: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
Tim Graham
8a1b4dbda2 [1.5.X] Fixed #19461 - Linked to psycopg in topics/install.txt 
Thanks Chris Jerdonek for the suggestion.

Backport of 6cad5f212a from master
 2012-12-11 18:45:03 -05:00
Tim Graham
d92d9cf2aa [1.5.X] Fixed #19377 - Emphasized database host link in tutorial 
Backport of 0eed8ece32 from master
 2012-12-11 16:35:37 -05:00
Florian Apolloner
deb205b8ce [1.5.X] Fixed an order dependant test failure. 
Backport of 7e97f4f510b2972c867ae7674fc40134413c16ab from master.
 2012-12-11 16:26:53 +01:00
Florian Apolloner
919fbe08c9 [1.5.X] Fixed a test failure in the comment tests. 
Backport of 1eb0da1c5ba3096f218d1df13d02a2b8e1ac7a36 from master.
 2012-12-10 23:36:17 +01:00
James Bennett
82d4786544 [1.5.x] Bump version numbers for security release. 1.5b2 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
Claude Paroz
984cf8417b [1.5.x] Amended an SQL test fixture to not include an id value 
Some backends might need special handling for auto-increment values.
This was introduced in 5fa5621f574. Thanks Michael Manfre for spotting
the issue.
Backport of 0cdfa76e68 from master.
 2012-12-10 17:50:37 +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
fce779475e [1.5.x] Removed US localflavor-specific tests from core 
Also fixes #9045.
Backport of 8248d1402 from master.
 2012-12-08 21:08:37 +01:00
Aymeric Augustin
c81e8e7068 [1.5.x] Fixed #19389 -- Docs on the location of contrib apps tests. 
Backport of d5ed81c.
 2012-12-08 19:48:41 +01:00
Val Neekman
152d6cb411 fix a spelling error in docs 
backport of cacafe8 from master.
 2012-12-08 14:51:41 +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
Claude Paroz
a0578a1a1c [1.5.x] Fixed #19444 -- Clarified IGNORABLE_404_URLS documentation 
Backport of 53b879f045 from master.
 2012-12-07 17:42:17 +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
Daniele Procida
a8045c3af2 [1.5.x] Amended explanation of LOCALE_PATHS setting. 
Thanks Daniele Procida for the patch.

37abad73d6b61031ece67d8e58612cb39326d28e from master.
 2012-12-04 20:20:35 -03: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
Anssi Kääriäinen
8c099ec3ec [1.5.x] Fixed #19391 -- Oracle specific failure in tests 
The failure was caused by using None as a choice for a CharField. To
avoid Oracle's "" <-> NULL handling the field type was changed to
IntegerField.

Backpatch of 632cf32b43609f7d674c81f81f01eb9e4a059f1f
 2012-12-04 23:00:17 +02:00
Julien Phalip
db455d6ff9 [1.5.x] Fixed the admin_filters tests for Postgres. 
Backport of c196e01100b2
 2012-12-04 10:39:49 -08: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