p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,734 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

14734 Commits

Author SHA1 Message Date
Aymeric Augustin 0e51d8eb66 Fixed #20463 -- Made get_or_create more robust. 
When an exception other than IntegrityError was raised, get_or_create
could fail and leave the database connection in an unusable state.

Thanks UloPe for the report.
 2013-05-22 10:56:06 +02:00
Marc Tamlyn adeec00979 Merge pull request #246 from dekkers/ticket_18709 
Fixed #18709 -- Check if initial_value is a callable
 2013-05-22 00:45:07 -07:00
Anssi Kääriäinen 904084611d Fixed #19895 -- Second iterator over invalid qs raises errors 
The fix was already in the patch for #18702, so only test added for
ticket #19895.
 2013-05-22 08:30:41 +03:00
Tim Graham 90a6c3aaf0 Merge pull request #1196 from selwin/last-doc-fix 
Slightly reworded 'last()' docs
 2013-05-21 17:35:33 -07:00
Jeroen Dekkers d0788c2770 Fixed #18709 -- Check if initial_value is a callable 
In _get_changed_data, check if initial_value is a callable and call it
if it is.
 2013-05-22 01:05:22 +02:00
Shai Berger dfe6ea3b1f Fixed #20012 -- test_year_lookup_edge_case fails under Oracle 
Used formatted date instead of datetime object for the end of the
year range, as the datetime object loses fractions-of-seconds when
inserted into the db.
 2013-05-22 01:52:15 +03:00
Shai Berger 8fd40b9ae7 Fixed #20015 -- date__startswith('2008') fails under Oracle 
Removed the explicit casting of strings to dates
 2013-05-22 01:52:15 +03:00
Shai Berger b6ad9998e6 Fixed #20453 -- inspectdb test failure on Oracle 2013-05-22 01:52:15 +03:00
Aymeric Augustin 5d16456991 Fixed #20476 -- Typo. 2013-05-21 21:29:14 +02:00
Anssi Kääriäinen 70679243d1 Fixed #18702 -- Removed chunked reads from QuerySet iteration 2013-05-21 19:51:59 +03:00
Selwin Ong 375e275030 Slightly reworded 'last()' docs. 2013-05-21 23:18:35 +07:00
Selwin Ong ea9a0857d4 Fixed #19326 -- Added first() and last() methods to QuerySet 2013-05-21 18:52:28 +03:00
Claude Paroz d595b61aca (Re-)moved some imports 2013-05-21 17:34:19 +02:00
Mathijs de Bruin 61a8de6f4f Fixed #6412 -- More details if a template file cannot be loaded 
Report more details about template files in loader postmortem.
 2013-05-21 16:59:40 +02:00
Claude Paroz fd961941cc Imported copyreg from six.moves 2013-05-21 14:41:39 +02:00
Florian Apolloner 800513e7f3 Merge pull request #1194 from ambv/python26_is_fun 
Fixed a Python 2.6 regression (GzipFile can't act as a context manager)
 2013-05-21 04:20:35 -07:00
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