962f0dbd77
Fixed #10075 : Allowed saving of inline-edited models that use multi-table inheritance.
...
r9809 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-03 14:24:06 +00:00
ebd30acd12
[1.0.X] Block changesets with new function and new function fixes from merge to branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-03 14:19:51 +00:00
5d417c44b7
[1.0.X] Corrected code block in apache auth docs.
...
Backport of r9806 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-03 03:15:25 +00:00
8a1b24cc42
[1.0.X] Now use `subprocess.Popen` instead of the deprecated os.popen3 to issue PostGIS test database creation commands.
...
Backport of r9801 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-01 17:52:25 +00:00
2dce7064f4
[1.0.X] Fixed #8638 -- Added documentation on how to redirect email to a dummy server for testing purposes. Thanks to Rob Hudson and Marc Fargas for their work on the draft for this change.
...
Merge of r9793 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-29 23:40:57 +00:00
c3df5d96d2
[1.0.X] Blocked the F() expression feature in r9792 from merging.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-29 23:37:58 +00:00
0f8f27f417
[1.0.X] Fixed #10152 -- Fixed typo in porting guide. Thanks eagle-eyed anonymous.
...
r9795 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-29 20:25:25 +00:00
aa0023b32c
[1.0.X] Block new function changesets from merge to branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-29 20:19:52 +00:00
405b87c432
[1.0.X] Fixed #10110 -- Added FAQ on how and when to poke the core developers about tickets. Thanks to Graham King for turning a couple of django-dev posts into a good first draft.
...
Merge of r9789 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-24 12:12:26 +00:00
47ed900b41
[1.0.X] Fixed #10103 : Testcase fix for Jython compatibility. Thanks for report and patch leosoto.
...
r9782 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-23 05:00:09 +00:00
042777c838
[1.0.X] Block new function fix from merge to branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-23 04:57:15 +00:00
ca777ab08c
[1.0.X] Fixed #9275 : Extended the Oracle date format to allow DATE columns to be used with DateTimeFields, especially when using legacy databases. Thanks to hollerith for the patch. Backport of [9779] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-19 20:50:31 +00:00
709476ae05
[1.0.X] Fixed #10069 -- Fixed the model form unique validation code to not proceed with using, for example, RelatedObjects returned by get_field_by_name as though they were model Fields.
...
r9777 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-19 19:43:01 +00:00
3e19109ab6
[1.0.X] Fixed #9789 -- Handle jython's compiled settings filename correctly.
...
Patch from Frank Wierzbicki.
Backport of r9775 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-19 12:48:41 +00:00
5ce4031a61
[1.0.X] Corrected code in serializers_regress testcase so that, in the case where an exception has been raised, rollback is called before attempting to leave transaction management. With the old code the original exception (IntegrityError on InnoDB) was getting hidden by a transaction management error resulting from attempting to leave transaction management with a pending commit/rollback.
...
r9773 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-18 22:09:56 +00:00
02980f1c3c
[1.0.X] Fixed #8055 : Replaced use of traceback.format_exc (new in Python 2.4) with something that works as far back as 2.3.
...
Thanks to Ramiro for diagnosis and patch.
Backport of r9770 from trunk.
Also updated svn metadata; all trunk bugfixes have been merged to the 1.0.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-17 23:06:23 +00:00
2ffeea2013
[1.0.X] Block trunk new function commits from svnmerge.py consideration.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-17 22:36:07 +00:00
f0e35e1bbe
[1.0.X] Fixed #5543 : callproc() and friends now work with Oracle and our FormatStylePlaceholderCursor.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-16 22:24:45 +00:00
4268ef3fdc
[1.0.X] Fixed #6767 : corrected a 2.3 compatibility issue in [9750]. Thanks to tlow. Backport of [9761] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-16 16:53:12 +00:00
7cef4ecd19
[1.0.X] Fixed #10014 -- Don't crash when using debug template tag inside a block node tag.
...
Returning non-ASCII characters from TextNode.__repr__ was causing
problems in the BlockNode.__repr__ method (and probably in other places
we don't know about yet). We now forcibly convert to ascii and replace any
unconvertible characters, rather than returning some moderately
corrupted data in the non-ASCII case.
Backport of r9757 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-16 09:00:24 +00:00
ad93542c8f
[1.0.X] Fixed #6767 : changed the way the Oracle backend fetches numbers to prevent decimals being returned as floats. Backport of [9750] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 20:40:40 +00:00
43c1a87708
[1.0.X] Updated name as per author's request.
...
Backport of r9740 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 06:38:27 +00:00
0cc51e8fdd
A handful of fixes to django.contrib.comments:
...
* Fixed #9143 , #9429 , and #9439 (was r9730 on trunk)
* Fixed #9959 : comment preview documentation example (was r9731 on trunk)
* Fixed #9346 : comment upgrade SQL in documentation. (was r9732 on trunk).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-14 17:00:15 +00:00
7dd0abc113
[1.0.X] Bring svnmerge metadata up to date with what's actually been merged to the branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-14 16:02:59 +00:00
8064e088e6
[1.0.X] Block two more revisions fumblefingers missed in the last attempt.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-14 15:37:23 +00:00
610aedacca
[1.0.X] Block trunk new function commits from svnmerge.py consideration.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-14 15:33:07 +00:00
8bf4e84c85
[1.0.X] Fixed #9278 , #9694 -- Geographic overlays now display in admin with right to left langauges; simplified transformation process in `OpenLayersWidget` to fix Ubuntu 8.10/Apache 2.2.9 crash; updated OpenLayers version to 2.7.
...
Backport of r9733 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-13 02:21:07 +00:00
37260e046f
[1.0.X] Revised r9567 slightly to be backwards compatible with versions 1.0 - 1.0.2.
...
Also documented the change. We prefer to load directory_index.html for static
directory listings, but if you have the (older style) "directory_index"
template and no .html version, we'll load that. This should stop a bunch of
mysterious breakages when people upgrade to Django 1.0.3 or Django 1.1. Also
keeps the docs in sync with released code.
Fixed #9993 .
Backport of r9725 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-09 12:42:35 +00:00
195a6ea791
[1.0.X] Fixed #9569 , #9636 : Updated Simplified Chinese translation.
...
Backport of r9721 and r9722 from trunk (with makemessages re-run to ensure the
line numbers match on the branch).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-08 10:38:40 +00:00
2842f5979a
[1.0.X] Fixed #9888 -- Updated Japanese translation from Takashi Matsuo.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-08 10:20:58 +00:00
cc76b89c59
[1.0.X] Fixed #9985 -- qs.values_list(...).values(...) was constructing incorrect SQL.
...
Backport of r9717 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-08 05:51:15 +00:00
fe9cd02f38
[1.0.x] Fixed #9972 : The dbshell command was ignoring the DATABASE_HOST and DATABASE_PORT settings in Oracle. Backport of [9713] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-08 05:16:47 +00:00
f3f251a6de
[1.0.X] Return None for null date/time fields in OGR-supported data sources. Thanks to Ariel Mauricio Nunez Gomez for bug report and initial patch.
...
Backport of r9711 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-07 20:23:23 +00:00
f6cacacbff
[1.0.X] Refs #9935 : Added a note in the documentation to the effect that Django currently requires a 4.X release of cx_Oracle. Backport of [9709] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-06 18:25:52 +00:00
ff3320cb6d
[1.0.X] Documented that case-insensitive matching is not supported for non-ASCII
...
strings in SQLite. Refs #9905 .
Backport of r9705 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-06 03:35:46 +00:00
e8ddef57d8
[1.0.X] Fixed #9862 -- For better SQL portability, don't specify "NULL" on nullable columns when creating tables. Patch from Ian Kelly.
...
Columns are NULL by default, so we only need to use "NOT NULL" when we want
non-default behaviour.
Backport of r9703 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-06 01:57:03 +00:00
7982e5c510
Added a link to RKM's blog in the committers file.
...
Backport of r9698 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-03 05:06:22 +00:00
f2986d89b9
[1.0.X] Fixed #9942 -- Added a to_python handler for FloatField to ensure correct typing of deserialized data before saving. Underlying problem is analogous to #8298 , fixed in [8515]. Thanks to David Larlet <larlet@gmail.com> for the report and fix.
...
Backport of r9695 and r9696 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-03 04:59:05 +00:00
94b83db499
[1.0.X] Fixed `check_geom` and `check_srs` to accept larger sized pointer addresses as returned by some platforms (including OpenBSD 4.4 and Fedora 8).
...
Backport of r9693 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-03 01:42:56 +00:00
1f2e21ba07
[1.0.X] Update svnmerge metadata -- all bugfix changesets from trunk have been merged to 1.0.X.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-30 15:27:09 +00:00
fadccc6494
[1.0.X] Block changeset relating to CSS refactor from svnmerge to 1.0.X branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-30 15:22:04 +00:00
d2c9c1261a
[1.0.X] Fixed #9664 -- `LayerMapping` now works with MySQL spatial backends.
...
Backport of r9688 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-26 20:07:36 +00:00
04ce539ad2
[1.0.X] Fixed #9892 -- support additional binary packages for GEOS & GDAL libs on OSX & Ubuntu platforms.
...
Backport of r9686 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-26 16:04:48 +00:00
fd9ddb2dc1
[1.0.X] Merged [9682], [9683] and [9684] from trunk. These were changes dealing with documenting and adding a helpful error message for the quirk of admin users needing 'change user' permission to add users. Refs #9866
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-26 06:02:44 +00:00
3abbb455b2
[1.0.X] Fixed #8245 -- Added a LOADING flag to autodiscover to prevent an admin.py module with errors from raising a spurious AlreadyRegistered exception in a subsequent call to autodiscover.
...
Backport of r9680 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 18:28:22 +00:00
9841776ec3
[1.0.X] Fixed #9882 -- Added `alters_data = True` to `BaseModelForm.save` method, thanks dc.
...
Backport of r9678 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 05:52:57 +00:00
1d37663aef
[1.0.X] Fixed #9884 -- Corrected template example in model forms documentation, thanks bradmontgomery.
...
Backport of r9676 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 05:22:10 +00:00
44239004db
[1.0.X] Fixed #9902 -- Corrected misspelling in form validation documentation, thanks zunzun.
...
Backport of r9674 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 04:14:51 +00:00
47de671948
[1.0.X] Fixed #9896 -- Corrected a couple uses of `formset.forms`, thanks aglzen.
...
Backport of r9672 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 00:15:03 +00:00
518e19a363
[1.0.X] Fixed #9780 -- Fixed an undefined internal link in the model forms documentation, thanks ramiro.
...
Backport of r9670 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 00:03:19 +00:00
Karen Tracey
Gary Wilson Jr
Justin Bronn
Russell Keith-Magee
Ian Kelly
Malcolm Tredinnick
Matt Boersma
Jacob Kaplan-Moss
Adrian Holovaty