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
Claude Paroz
dc95791e61 [1.5.x] Fixed #19261 -- Delayed Queryset evaluation in paginators 
Thanks trbs for the report and the patch.
Backport of 1b307d6c8f from master.
 2012-11-09 19:44:47 +01:00
Florian Apolloner
31eefc8349 [1.5.X] Added missing encoding preamble to gis tests. 
'coverage html' did fail without it.

Thanks to Claude Paroz for figuring it out.

Backport of aea8bf06620c931f7b1e7d991497d593b91f71c9 from master.
 2012-11-09 15:33:37 +01:00
Anssi Kääriäinen
908226cf1a [1.5.x] Fixed #17144 -- MySQL again groups by PK only 
Thanks to Christian Oudard for the report and tests.

Backpatch of [cafb266954e21dd55ddfa90597bcf02c022bcb7d]

Conflicts:

	django/db/models/sql/compiler.py
 2012-11-08 01:10:24 +02:00
Claude Paroz
34d0c30e87 [1.5.x] Fixed #19257 -- Don't swallow command's KeyError in call_command 
Thanks Giovanni Bajo for the report.
Backport of 9a09558e9f from master.
 2012-11-07 18:30:10 +01:00
Claude Paroz
e645c89bbb [1.5.x] Fixed #14315 -- Made memcached backend handle negative incr/decr values 
Thanks Michael Manfre for the report and initial patch and
Tobias McNulty for the review.

Backport of 79dd751b0b from master.
 2012-11-06 12:23:32 +01:00
Aymeric Augustin
93e0ec553d [1.5.x] Fixed #19254 -- Bug in SESSION_FILE_PATH handling. 
Thanks simonb for the report.

Refs #18194.

Backport of 11fd00c from master.
 2012-11-06 10:21:30 +01:00
Claude Paroz
a23c9c48a8 [1.5.x] Fixed #8627 -- Prevented textareas to swallow first newline content 
Browsers consider the first newline in textareas as some display
artifact, not real content. Hence they are not sending it back to
the server. If we want to keep initial newlines, we have to add one
when we render the textarea.
Thanks bastih for the report and initial patch.

Backport of 78f66691ee from master.
 2012-11-05 20:56:25 +01:00
Preston Holmes
c7d5e7c75b [1.5.x] Fixed py3 compatibility for 5a00a57aa591c766f5ee1d8c59b64618d74fe191 2012-11-04 23:39:56 -08:00
Alex Gaynor
d35b95c2f4 Merge branch 'stable/1.5.x' of https://github.com/django/django into stable/1.5.x 2012-11-04 15:58:54 -08:00
Alex Gaynor
d828d4e186 [1.5.x] Merge pull request #495 from aisipos/ticket_18949 
Fixed #18949 -- Improve performance of model_to_dict with many-to-many

Backport of 4d766b3c9aca36cbe7dc71df0cc93fb6f9deea60.
 2012-11-04 15:58:37 -08:00
Preston Holmes
b85cb92ba9 [1.5.x] Fixed #19240 -- include pagination error details in ListView 404 
Thanks to seawolf for the patch
 2012-11-04 15:52:41 -08:00
Alex Gaynor
69a0c91c90 [1.5.x]Merge pull request #494 from mrj0/model_split 
model_split: Fixed #19236 - fixed error for abstract models with a split method

Backport of 8d3f932f18c75fcbb32cf3dd5998445d65b5db0f
 2012-11-04 14:21:49 -08:00
Alex Gaynor
6f716e9e5f [1.5.x] Fixed #5805 -- it is now possible to specify multi-column indexes. Thanks to jgelens for the original patch. Backport of 4285571c5a9bf6ca3cb7c4d774942b9ae5b537e4. 2012-11-04 10:26:59 -08:00
Aymeric Augustin
d7688a010a [1.5.x] Fixed #18963 -- Used a subclass-friendly pattern 
for Python 2 object model compatibility methods.

Backport of fc10418 from master.
 2012-11-03 22:08:05 +01:00
Aymeric Augustin
be6522561f [1.5.x] Fixed #15152 -- Avoided crash of CommonMiddleware on broken querystring 
Backport of 973f539 from master.
 2012-11-03 21:28:49 +01:00
Claude Paroz
e51a9c0c94 [1.5.x] Prevented host resolution when running dev server 
Refs #19075, #2494.
Thanks Karen Tracey for spotting the issue.

Backport of 3e98d98b6 from master.
 2012-11-03 20:13:18 +01:00
Aymeric Augustin
b99707bded [1.5.x] Fixed #19101 -- Decoding of non-ASCII POST data on Python 3. 
Thanks Claude Paroz.

Backport of 095eca8 from master.
 2012-11-03 13:07:02 +01:00
Ulrich Petri
f12fa7750c [1.5.X] Fixed #17549 -- Added a clickable link for URLFields in admin change list. 
Backport of ac2052ebc84c45709ab5f0f25e685bf656ce79bc from master.
 2012-11-03 11:59:16 +01:00
Preston Holmes
0131da0622 [1.5.x] Deprecated depth kwarg on select_related. 
This is the start of a deprecation path for the depth kwarg on
select_related. Removing this will allow us to update select_related so
it chains properly and have an API similar to prefetch_related.

Thanks to Marc Tamlyn for spearheading and initial patch.

refs #16855
 2012-11-02 22:03:55 -07:00
Tim Graham
c5d0f49dc2 [1.5.X] Added WizardView.file_storage exception message and docs 
Thanks Danilo Bargen for the patch.

Backport of af7ea808d8 from master
 2012-11-01 18:02:32 -04:00
Claude Paroz
a8c415f844 [1.5.x] Fixed #16678 -- Wrote tests for contrib.redirects app 
Thanks Julien Phalip for the report.
Backport of d9213d09db from master.
 2012-11-01 19:49:08 +01:00
Andrew Godwin
f1be2c7a81 Fixed #19070 -- urlize filter no longer raises exceptions on 2.7 
Thanks to claudep for the patch.
 2012-10-31 11:01:39 +00:00
Aymeric Augustin
0dcaddb571 Fixed #17083 -- Allowed sessions to use non-default cache. 2012-10-31 09:51:19 +01:00
Claude Paroz
9c4ddea8e6 [1.5.x] Fixed #19174 -- Fixed capitalization errors in LANG_INFO 
Thanks waldeinburg for the report.
Backport of 2f035a9 from master.
 2012-10-30 23:07:31 +01:00
Claude Paroz
a24ffa52d0 [1.5.x] Fixed #17744 -- Reset default file storage with setting_changed signal 
Backport of 9a0285134 from master.
 2012-10-30 22:26:03 +01:00
Claude Paroz
5229ac20be [1.5.x] Fixed #15714 -- Added note about capitalization of LANG_INFO name_local 
Backport of 5dc4437df from master.
 2012-10-30 09:31:25 +01:00
Claude Paroz
3f3076edbf [1.5.x] Fixed #5076 -- Properly decode POSTs with non-utf-8 payload encoding 
Thanks daniel at blogg.se for the report and Aymeric Augustin for
his assistance on the patch.

Backport of 6de6988f9 from master.
 2012-10-30 09:01:57 +01:00
Preston Holmes
e8269a6729 [1.5.x] Fixed #17869 - force logout when REMOTE_USER header disappears 
If the current sessions user was logged in via a remote user backend log out
the user if REMOTE_USER header not available - otherwise leave it to other auth
middleware to install the AnonymousUser.

Thanks to Sylvain Bouchard for the initial patch and ticket maintenance.
 2012-10-29 22:58:36 -07:00
Preston Holmes
402a986c25 [1.5.x] Fixed #19057 (again) -- added additional tests 2012-10-29 22:33:46 -07:00
Russell Keith-Magee
e784b5e594 [1.5.X] Added some test guards for some recently added auth tests. 
Refs #19061, #19057.
 2012-10-30 10:27:01 +08:00
Claude Paroz
8c556a32f2 [1.5.x] Fixed #19172 -- Isolated poisoned_http_host tests from 500 handlers 
Thanks bernardofontes for the report.

Backport of b774c5993 from master.
 2012-10-29 17:29:28 +01:00
Luke Plant
d7d7ad2881 [1.5.x] Fixed #17991 - prefetch_related fails with GenericRelation and varchar ID field 
Thanks to okke@formsma.nl for the report, and carmandrew@gmail.com for the tests.

Backport of ccd14ff25b7642678bf3c9ed8a12643f04853144 from master
 2012-10-29 14:41:05 +00:00
Preston Holmes
f427ecdc88 [1.5.x] Fixed #19061 -- added is_active attribute to AbstractBaseUser 2012-10-28 23:06:09 -07:00
Claude Paroz
b4627bcabe [1.5.x] Fixed #18575 -- Empty DATABASES should default to dummy backend 
Thanks delormemarco@gmail.com for the report.

Backport of f1cc2be0c from master.
 2012-10-28 23:46:54 +01:00
Aymeric Augustin
95f3f0cbbe [1.5.x] Fixed a typo in aff9b2f. 
Thanks void.

Backport of effe96b from master.
 2012-10-28 22:36:01 +01:00
Aymeric Augustin
88393357a6 [1.5.x] Marked cookies-based session expiry test as an expected failure. 
Refs #19201.

Backport of 58337b3 from master.
 2012-10-28 18:04:50 +01:00
Aymeric Augustin
780eaa4779 [1.5.x] Required serializer to use bytes in loads/dumps 
loads has no way to tell if it should provide text or bytes to the
serializer; bytes are more reasonnable for a serialized representation,
and are the only option for pickled data.

dumps can perform conversions on the value it receives from the
serializer; but for consistency it seems better to require bytes too.

The current code would cause an exception when loading pickled session
data. See next commit.

Also fixed a bug when checking for compressed data.

Backport of 58a086a from master.
 2012-10-28 18:04:21 +01:00
Anssi Kääriäinen
f105fbe52b [1.5.x] Fixed #18823 -- Ensured m2m.clear() works when using through+to_field 
There was a potential data-loss issue involved -- when clearing
instance's m2m assignments it was possible some other instance's
m2m data was deleted instead.

This commit also improved None handling for to_field cases.

Backpatch of 611c4d6f1c24763e5e6e331a5dcf9b610288aaa8
 2012-10-28 17:34:14 +02:00
Aymeric Augustin
13b4d44860 [1.5.x] Reverted unintentional change in aff9b2f. 
Backport of 785bf0d from master.
 2012-10-28 12:34:24 +01:00
Aymeric Augustin
54b45dfb53 [1.5.x] Fixed #19203 -- Added isolation to a humanize test 
Thanks lrekucki for the report.

Backport of aff9b2f from master.
 2012-10-28 09:35:04 +01:00
Aymeric Augustin
39082494e6 [1.5.x] Fixed #18194 -- Expiration of file-based sessions 
* Prevented stale session files from being loaded
* Added removal of stale session files in django-admin.py clearsessions

Thanks ej for the report, crodjer and Elvard for their inputs.

Backport of 5fec97b from master.
 2012-10-28 09:21:56 +01:00
Aymeric Augustin
e6b0ee768c [1.5.x] Improved tests introduced in 04b00b6. 
These tests are expected to fail for the file session backend because it
doesn't handle expiry properly. They didn't because of an error in the
test setup sequence.

Refs #19200, #18194.

Backport of 882c47c from master.
 2012-10-28 09:21:27 +01:00
Aymeric Augustin
845d8408e7 [1.5.x] Added optional kwargs to get_expiry_age/date. 
This change allows for cleaner tests: we can test the exact output.

Refs #18194: this change makes it possible to compute session expiry
dates at times other than when the session is saved.

Fixed #18458: the existence of the `modification` kwarg implies that you
must pass it to get_expiry_age/date if you call these functions outside
of a short request - response cycle (the intended use case).

Backport of cd17a24 from master.
 2012-10-28 09:20:54 +01:00
Aymeric Augustin
0fe02feab4 [1.5.x] Fixed #19200 -- Session expiry with cached_db 
Also did a little bit of cleanup.

Backport of 04b00b6 from master.
 2012-10-27 19:41:12 +02:00
Aymeric Augustin
b760503a27 [1.5.x] Fixed #18978 -- Moved cleanup command to sessions. 
This removes a dependency of 'core' on 'contrib'.

Backport of 83ba0a9 from master.

This deprecation occurs after the alpha, but it's a prerequisite
for fixing decently #18194 which is a release blocker.
 2012-10-27 18:38:32 +02:00
Anssi Kääriäinen
15ea36dfc0 [1.5.x] Ensured gis tests aren't run on non-gis Oracle 
Backpatch of b55de81b9e4d820a223c066022050a0df0ee1dd0
 2012-10-27 19:26:33 +03:00
Anssi Kääriäinen
fa1083fb0c [1.5.x] Fixed Oracle failure caused by None converted to '' in select_related case 
Backpatch of c159d9cec0baab7bbd04d5d51a92a51e354a722a
 2012-10-27 19:25:14 +03:00
Anssi Kääriäinen
18357bf3ac [1.5.x] Fixed Oracle failure for "%" in table name 
Backpatch of 2249bd275cbae6b73716bf36f5f36def1bb4222e
 2012-10-27 19:24:48 +03:00
Claude Paroz
fbb664066f [1.5.x] Fixed #16820 -- Treated '0' value as True for checkbox inputs 
Thanks Dan Fairs for the report and the initial patch.

Backport of be29329cc from master.
 2012-10-26 20:48:57 +02:00
Ian Clelland
b430e1db5f [1.5.x] Properly support pickling of LazyObjects in Python 3.3 
Backport of 836cd26d7f3394452f1f5196eb26c99fef128a1a from master
 2012-10-26 02:40:19 +01:00