3550aa2d14
[1.0.X] Fixed ##9842: allow imports of apps that use settings in __init__.py files.
...
Backport of r9843 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 17:05:36 +00:00
734376f947
[1.0.X] Fixed #9214 : EmailMessage now respects the From header instead of blindly using from_email. Thanks, Tai Lee.
...
Backport of r9842 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 17:02:03 +00:00
bd2e7a7876
[1.0.X] Block a bunch of trunk-only changesets from merge to branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 16:58:50 +00:00
93b3f89c31
[1.0.X] Fixed #10274 -- Fixed an embarrassing mistake in BaseGenericInlineFormSet.get_queryset. Thanks Zak Johnson for the report and akaihola for the patch.
...
Backport of r9886 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-23 04:31:29 +00:00
eb442961f5
[1.0.X] Fixed #10307 -- Removed references to FM/Federated States of Micronesia from the US localflavor STATES_NORMALIZED setting. Thanks to mnd for the report.
...
Merge of r9855 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 11:25:25 +00:00
c2807db683
[1.0.X] Fixed #10256 -- Corrected the interaction of extra(select=) with values() and values_list() where an explicit list of columns is requested.
...
Merge of r9837 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 11:18:19 +00:00
8366ef412e
[1.0.X] Blocked AUTHORS addition in r9882 from merge.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 10:25:45 +00:00
315fd2434c
Added SVNmerge annotations for some revisions already merged, and some that need to be blocked.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 09:23:21 +00:00
ef66773cef
[1.0.X] Fixed #9031 -- Clarified the error message when the label used to run a specific test case method doesn't name a valid test case class. Thanks to Thomas Guettler for the suggestion and patch.
...
Merge of r9879 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 08:38:42 +00:00
3c48d866f6
[1.0.X] Fixed #9276 -- Corrected the way the CSS class is rolled out in a stacked edit-inline template. Thanks to creecode@gmail.com for the report and fix.
...
Merge of r9877 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 08:08:17 +00:00
16f05e78f1
[1.0.X] Fixed #9347 -- Added an entry in the field reference for the verbose_name option. Thanks to marcoberi for the suggestion, and timo for the eventual patch.
...
Merge of r9865 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 07:19:26 +00:00
d12ee872a1
[1.0.X] Fixed #9939 -- Corrected minor error in model fields documentation. Thanks to seemant for the report.
...
Merge of r9864 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 07:17:23 +00:00
b8797aebf0
[1.0.X] Fixed #10007 -- Corrected (and narrowed) a reference to the Python standard library documentation. Thanks to d00gs for the report.
...
Merge of r9863 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 07:15:40 +00:00
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
Jacob Kaplan-Moss
Karen Tracey
Brian Rosner
Russell Keith-Magee
Adrian Holovaty
Gary Wilson Jr
Marc Fargas
Ian Kelly
Justin Bronn
Malcolm Tredinnick
Matt Boersma