mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 23:44:22 +00:00
Code Issues 24 Releases Wiki Activity
14,768 Commits 28 Branches 423 Tags 639 MiB
92c9052add
Commit Graph

14768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wiktor Kolodziej
cec9558fba Fixed #17308 -- Enabled the use of short_description on properties in the admin. 2013-05-21 13:19:18 +02:00
Łukasz Langa
c28281f9d6 Fixed a Python 2.6 regression (GzipFile can't act as a context manager) 2013-05-21 13:18:53 +02:00
Florian Apolloner
b1ac241ddc Fixed test failures from 09f8652765. 2013-05-21 13:03:25 +02:00
Marc Tamlyn
b632baac3c Merge pull request #1192 from mjtamlyn/assertIsInstance 
Use assertIsInstance in test code.
 2013-05-21 02:51:14 -07:00
Marc Tamlyn
09f8652765 Use assertIsInstance in tests. 
Gives much nicer errors when it fails.
 2013-05-21 10:42:15 +01:00
Florian Apolloner
60585f6621 Merge pull request #1190 from ambv/doc_settings_fix 
Removed a confusing duplicate SESSION_COOKIE_DOMAIN header
 2013-05-21 02:33:40 -07:00
Aymeric Augustin
18856f866c Merge pull request #1191 from ambv/content_is_bytes 
Fixed #20472: response.content should be bytes on both Python 2 and 3
 2013-05-21 01:26:35 -07:00
Daniel Lindsley
e24d486fbc Fixed #20212 - __reduce__ should only be defined for Py3+. 2013-05-21 00:49:21 -07:00
Łukasz Langa
0594fed9ff Fixed #20472: response.content should be bytes on both Python 2 and 3 2013-05-21 01:28:16 +02:00
Łukasz Langa
a542b808ba Removed a confusing duplicate SESSION_COOKIE_DOMAIN header 
The note is clearly a part of MESSAGE_STORAGE documentation. As a separate
section, it broke automatic link generation on the HTML version of the
documentation.
 2013-05-21 00:53:40 +02:00
Ramiro Morales
4ba1c2e785 Fixed #9321 -- Deprecated hard-coding of help text in model ManyToManyField fields. 
This is backward incompatible for custom form field/widgets that rely
on the hard-coded 'Hold down "Control", or "Command" on a Mac, to select
more than one.' sentence.

Application that use standard model form fields and widgets aren't
affected but need to start handling these help texts by themselves
before Django 1.8.

For more details, see the related release notes and deprecation timeline
sections added with this commit.
 2013-05-20 16:29:51 -03:00
Tim Graham
2fd61285d1 Fixed #20471 - Typos in topics/forms/formsets.txt 2013-05-20 13:56:19 -04:00
Tim Graham
490672f057 Tweaked unit test 'quick start' explanation. 
Thanks Jeremy Dunck.
 2013-05-20 13:45:32 -04:00
Jorge Bastida
888c86dcf3 Fixed #20445 -- Raised original exception after command error 2013-05-20 18:59:37 +02:00
Ryan Kaskel
4280217f31 Fixed #20403 -- Ignore forms marked for deletion when validating max_num. 2013-05-20 12:13:21 -04:00
Anssi Kääriäinen
266c0bb23e Fixed #20278 -- ensured .get() exceptions do not recurse infinitely 
A regression caused by d5b93d3281 made .get() error
reporting recurse infinitely on certain rare conditions. Fixed this by
not trying to print the given lookup kwargs.
 2013-05-20 18:50:40 +03:00
Anssi Kääriäinen
c9a96075fa Fixed #20378 -- regression in GenericRelation on abstract model 
When a GenericRelation was defined on abstract model, queries on childs
of the abstract model didn't work. The problem was in the way fields and
in particular field.rel was copied from models to their children.

The regression was likely caused by #19385. Thanks to Gavin Wahl for
spotting the regression.
 2013-05-20 18:02:10 +03:00
Tim Graham
d9d24c4521 Fixed warnings in admindocs; refs #20126. 2013-05-20 10:17:49 -04:00
Anssi Kääriäinen
f53059b411 Fixed qs.values() regression when used in subquery 2013-05-20 15:38:47 +03:00
Marc Tamlyn
a936726228 Merge pull request #1184 from alasdairnicol/reverse_view_docs_typo 
Fix typo in redirect view docs
 2013-05-20 01:24:38 -07:00
Marc Tamlyn
6d81d5d82e Merge pull request #1181 from aaugustin/better-api-to-disable-atomic-requests 
Changed API to disable ATOMIC_REQUESTS per view.
 2013-05-20 00:26:06 -07:00
Carl Meyer
a7dc13ec23 Fixed #20437 - marked a test-runner test as expected-fail under certain conditions. 2013-05-20 01:56:23 -04:00
Tomasz Jaskowski
022de7e139 Fixed #20449 - Corrected test sensitivity to current working dir. 2013-05-19 23:58:06 -04:00
Alasdair Nicol
428875775c Fix typo in redirect view docs 2013-05-20 00:59:17 +02:00
Alex Gaynor
7c56212c71 Lower the max length for a test field so that it works on MySQL. 2013-05-19 13:58:58 -07:00
Anssi Kääriäinen
190771d003 Fixed fixtures testing failure 
The failure was caused by generating the same warning from two tests.
The second time the same warning was raised it was swallowed by the
"once" simplefilter of warnings.
 2013-05-19 20:53:49 +03:00
Aymeric Augustin
6633eeb886 Changed API to disable ATOMIC_REQUESTS per view. 
A decorator is easier to apply to CBVs. Backwards compatibility isn't an
issue here, except for people running on a recent clone of master.

Fixed a few minor problems in the transactions docs while I was there.
 2013-05-19 19:53:16 +02:00
Tim Graham
e83ff42792 Fixed #20459 - Improved example for setting HTTP header fields. 
Thanks Jérémie Blaser.
 2013-05-19 12:30:53 -04:00
Preston Holmes
6786920fd8 Fixed #16330 -- added --pks option in dumpdata command 
Thanks to guettli for the initial ticket and patch, with additional work
from mehmetakyuz and Kevin Brolly.
 2013-05-19 09:10:40 -07:00
Tim Graham
bdde7feb26 Added some links in /docs/intro/overview.txt 
Thanks Claes Ström for the patch.
 2013-05-19 12:06:35 -04:00
Aymeric Augustin
f7d7d2be4b Made 2d309a70 compatible with Python 3. 2013-05-19 17:58:29 +02:00
Tim Graham
41bea033b7 Fixed #20183 - Clarified docs assumption that certain objects exist in database. 
Thanks Tomasz Jaskowski for the patch.
 2013-05-19 11:31:27 -04:00
Russell Keith-Magee
a4ab0e8b86 Merge pull request #1178 from bmispelon/master 
Fix for test failure introduced by 980ae2a.
 2013-05-19 08:08:09 -07:00
Russell Keith-Magee
c0719d076f Merge pull request #1166 from bbenko/ticket_15961 
Fixed #15961 -- Added get_search_results to ModelAdmin
 2013-05-19 07:57:12 -07:00
Baptiste Mispelon
3cb1e9b93c Fix test failure introduced by 980ae2ab29. 2013-05-19 16:51:36 +02:00
Bozidar Benko
2d309a7043 Fixed #15961 -- Modified ModelAdmin to allow for custom search methods. 
This adds a get_search_results method that users can override to
provide custom search strategies.

Thanks to Daniele Procida for help with the docs.
 2013-05-19 16:45:00 +02:00
Aymeric Augustin
b06f6c1618 Fixed test failure introduced in 1927bf7c91. 2013-05-19 16:23:14 +02:00
Erik Romijn
f88700d610 Fix #19664 -- Illegal Characters In Session Key Give Fatal Error On File Backend Only 2013-05-19 15:33:05 +02:00
Aymeric Augustin
a9b98f59aa Clarified when triagers should close tickets as needsinfo. 
https://groups.google.com/d/msg/django-developers/dyldP9kFADc/rHTlRBVEP8MJ
 2013-05-19 15:24:10 +02:00
Aymeric Augustin
181f2ec603 Fixed test failures with Oracle when pytz isn't installed. 
Thanks Shai Berger for the report.
 2013-05-19 14:38:48 +02:00
Marc Tamlyn
761bbbbbae Added Baptiste to AUTHORS. 2013-05-19 14:36:38 +02:00
Baptiste Mispelon
980ae2ab29 Fix #20447: URL names given to contrib.auth.views are now resolved. 
This commit also adds tests for the redirect feature of most auth views.
It also cleans up the tests, most notably using @override_settings instead
of ad-hoc setUp/tearDown methods.

Thanks to caumons for the report.

Conflicts:
	docs/releases/1.6.txt
 2013-05-19 14:36:38 +02:00
Andrew Godwin
9b22baddef Merge pull request #1130 from vdboor/issue_20442_get_for_id 
Fixed #20442: NoneType error when fetching a stale ContentType with get_for_id
 2013-05-19 05:33:17 -07:00
Marc Tamlyn
c6855e8a70 Merge pull request #1162 from sspross/patch-docs 
Add needed Imports to the Documentation, Part II
 2013-05-19 05:26:13 -07:00
Aymeric Augustin
c28b795804 Merge pull request #1164 from pyriku/get_or_create_through_m2m 
Integrity problems when using get_or_create through M2M
 2013-05-19 05:21:39 -07:00
Pablo Recio
65f9e0affd Fixes #18896. Add tests verifying that you can get IntegrityErrors using get_or_create through relations like M2M, and it also adds a note into the documentation warning about it 2013-05-19 14:16:12 +02:00
Aymeric Augustin
d34b1c29e2 Merge pull request #1161 from erikr/urlize-additional-test 
Fixed #19070 -- Additional test for urlize and brackets
 2013-05-19 04:59:15 -07:00
Aymeric Augustin
f7467181aa Merge pull request #1160 from erikr/host-inet-postgres2 
Fixed #11442 -- Postgresql backend casts all inet types to text
 2013-05-19 04:57:10 -07:00
Erik Romijn
1927bf7c91 Fix #19070 -- Additional test for urlize and brackets 2013-05-19 13:39:21 +02:00
vkuzma
1fe587d80b Add missing imports and models to the examples in the admin documentation 2013-05-19 13:35:19 +02:00