Commit Graph

6690 Commits

Author SHA1 Message Date
Jarek Zgoda 8928a8c9f8 [1.0.X] Polish translations updated
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 08:53:23 +00:00
Malcolm Tredinnick 888b154e9b [1.0.X] Fixed #10392 -- Fixed an oversight from the refactoring in r9947.
Backport of r9953 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 08:26:07 +00:00
Malcolm Tredinnick 1a5588fceb [1.0.X] Small edit to the caching docs.
Turns out, super-lightning is not faster than normal lightning. :-)

Backport of r9949 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 05:47:25 +00:00
Malcolm Tredinnick 0249177836 [1.0.X] Removed a test that was accidentally merged as part of r9927.
This was testing a feature that doesn't exist in the 1.0.X branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 05:19:51 +00:00
Malcolm Tredinnick 32be118081 Removed some import-time dependencies on Django's settings.
Now you can import the file storage stuff and still call settings.configure()
afterwards. There is still one import-time usage of settings in
django.contrib.comments, but that's unavoidable.

Backport of r9945 and r9946 from trunk (this is needed in order to fix #8193 in
a clean fashion, which is why it's being backported).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 04:57:03 +00:00
Malcolm Tredinnick 9576353835 [1.0.X] The database cache wasn't correctly handling expired keys. Fixed now.
The cache tests have been failing for a long time with the db backend. This
change makes them pass again, so no test changes required here.

Backport of r9942 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02 03:17:30 +00:00
Jannis Leidel ec5a3e7a8d [1.0.X] Updated German translation, fixes #10189. Thanks julianb
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 14:24:08 +00:00
Malcolm Tredinnick ec02cf7a85 [1.0.X] Changed the way cache specifiers are parsed.
Allows us to reuse the same code in multiple places, avoiding new and
interesting bugs (the testing framework had a DIY version that was slightly
wrong, for example). Fixed #9833.

Backport of r9936 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 08:15:52 +00:00
Malcolm Tredinnick 4d2de7a307 [1.0.X] Fixed #9548 -- Correctly detect existence of empty sessions with cache backend.
Backport of r9934 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 07:33:45 +00:00
Malcolm Tredinnick 3fc72ca8a8 [1.0.X] Fixed #8737 -- Made the PostgreSQL version number detection more flexible.
Backport of r9931 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 07:20:19 +00:00
Malcolm Tredinnick a899f7c662 [1.0.X] Fixed a misnamed test that was inadvertently hiding an earlier one.
Backport of r9929 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 07:19:55 +00:00
Malcolm Tredinnick 016f12a2c2 [1.0.X] Fixed insert/update handling when no database interaction is required.
Fixed #10205 as part of this.

Backport of r9926 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 01:59:18 +00:00
Malcolm Tredinnick 283c89e4c6 [1.0.X] Fixed #10202 -- Fixed another couple of slicing edge-cases with querysets.
Patch from Alex Gaynor and Ramiro Morales.

Backport of r9924 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01 01:35:36 +00:00
James Bennett 9b5b2ee2f3 [1.0.X] Fixed #10377: Added clearer warning to database notes for cx_Oracle 5.0.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 06:05:44 +00:00
Malcolm Tredinnick 9b373d0789 [1.0.X] Fixed #10048 -- Handle non-existent timezone in dateformat functions.
Backport of r9919 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 04:52:16 +00:00
Malcolm Tredinnick 106bd0f49e [1.0.X] Fixed #10028 -- Fixed a problem when ordering by related models.
Some results were inadvertently being excluded if we were ordering across a
nullable relation which itself ordering by a non-nullable relation.

Backport of r9916 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 03:02:52 +00:00
Malcolm Tredinnick 7fdd26c582 [1.0.X] Fixed #9634 -- Updated Slovak translation. Thanks Marcel Telka, Marian Andre and scrool.
Backport of r9913 and r9263 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28 01:24:24 +00:00
Russell Keith-Magee 2656e6bfa9 [1.0.x] Updated SVN merge properties for some recent commits.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-27 13:27:11 +00:00
Malcolm Tredinnick 424d158b01 [1.0.X] Invalidate the appropriate SITE_CACHE entry when saving a Site model.
This avoids the problem of, for example, saving a change to the Site model in
the admin interface and then seeing the wrong instanec returned in the next
call to get_current_site().

It's still possible to end up with an inconsistent cache if update() is used to
change the Site model, but that's pretty unavoidable. It's also a slightly odd
way to update a Site model, so if you really need to do that, you can manage to
call SiteManager.clear() at the same time.

Backport of r9908 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-27 05:00:38 +00:00
Luke Plant f799959008 [1.0.X] Fixed #10017 - PasswordResetForm.clean_email was not returning the value.
Thanks Zak Johnson, Leo

Backport of r9906 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-26 17:18:16 +00:00
Karen Tracey c9a63889f6 [1.0.X] Fixed #10347 -- Fixed incorrect AttributeError raised when attempting to access a FileField without an instance. Thanks for the report and patch dc.
[9902] from trunk.  Also updated svnmerge metadata; all trunk changesets have either been merged or blocked.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 17:28:33 +00:00
Jacob Kaplan-Moss 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
Jacob Kaplan-Moss 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
Karen Tracey 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
Brian Rosner 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Adrian Holovaty 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
Russell Keith-Magee 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
Gary Wilson Jr 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
Gary Wilson Jr 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
Marc Fargas 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
Marc Fargas 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
Marc Fargas 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
Brian Rosner 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
Brian Rosner 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