49216f50c6
Blocked r9862 from merge to v1.0.X branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 07:13:17 +00:00
0b619104dd
[1.0.X] Fixed #10025 -- Corrected two minor typos in source documentation. Thanks to Tarken for the report.
...
Merge of r9861 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 07:03:16 +00:00
624fc2e397
Blocked r9860 from merge to v1.0.X branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 07:01:05 +00:00
1bd70b4e22
[1.0.X] Fixed #10118 -- Clarified the error message raised when accessing a subclass model that doesn't exist. Thanks to peterbraden@peterbraden.co.uk for the suggestion.
...
Merge of r9859 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:43:35 +00:00
8519146963
[1.0.X] Fixed #10141 -- Added a missing import to the complex Feed example. Thanks to Temoto for the report.
...
Merge of r9858 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:41:41 +00:00
429b57d642
[1.0.X] Fixed #10298 -- Corrected the example for the get_list_or_404 shortcut. Thanks to Dagur for the report.
...
Merge of r9857 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:39:55 +00:00
a21e170de7
[1.0.X] Fixed #10312 -- Corrected a link to the Reportlab user guide. Thanks to JohnDoe for the report.
...
Merge of r9856 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:37:47 +00:00
267122978f
[1.0.X] Merged trunk changes [9850], [9851], [9852], [9853]
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-21 08:54:32 +00:00
d9b5a414ca
[1.0.X] Fixed #8551 -- Added REMOTE_ADDR to the default Test Client environment. Thanks to schmichael for the report and patch.
...
Merge of r9847 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-21 07:29:21 +00:00
910aa0ea28
[1.0.X] Auth-related doc cleanups:
...
* Added to documentation of missing characters from `allowed_chars` in `make_random_password`.
* Fixed several long lines and word wraps.
* Added a reference link to the "How to log a user in" section and made a later reference to this section an actual link using the `:ref:` directive.
* Turned a command line code example into a code block.
* Added attribute reference link for a ``request.META`` mention.
* Added `code-block:: html` directives for HTML examples.
* Corrected reference links for all the `auth.views` functions.
* Added a few function signatures and documentation of optional parameters that were missing for some of the the `auth.views` functions (refs #10272 ).
Backport of r9835 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-16 05:14:18 +00:00
b09a197a3e
[1.0.X] A few minor wording, whitespace, punctuation, and link changes for the middleware documentation.
...
Backport of r9833 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-15 05:47:30 +00:00
0f84cf9dfe
[1.0.X] Refs #8836 , Updated translation for Slovenian.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-13 11:03:16 +00:00
a03486e081
[1.0.X] Updated Catalan translation.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-13 10:58:40 +00:00
0924264cd8
[1.0.X] Updated Spanish Translation.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-13 10:58:08 +00:00
8a89cf9d18
[1.0.X] Fixed #10240 -- Restored YAML serialization with Decimal objects that broke with r9823. Thanks Alex Gaynor for the report.
...
Backport of r9825 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-12 02:55:32 +00:00
5db8dc3573
[1.0.X] Fixed #5903 -- DecimalField.get_default() now correctly returns a Decimal object when the model instance was not retrieved from the database. Thanks Justin Driscoll and pigletto.
...
Backport of r9823 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-11 20:14:24 +00:00
c283875389
[1.0.X] Fixed #10224 : Don't attempt to decode binary string data in the Oracle backend. Backport of [9821] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-11 00:16:44 +00:00
b0fd405c28
[1.0.X] Fixed #10125 : fixed the Oracle dsn construction code that was broken in [9712]. Backport of [9812] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-03 22:10:46 +00:00
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
Russell Keith-Magee
Adrian Holovaty
Gary Wilson Jr
Marc Fargas
Brian Rosner
Ian Kelly
Karen Tracey
Justin Bronn
Malcolm Tredinnick
Matt Boersma
Jacob Kaplan-Moss