Commit Graph

7493 Commits

Author SHA1 Message Date
Gary Wilson Jr 81f994583c [1.1.X] Fixed #12205 -- Corrected malformed reference links in the 1.1 and 1.1-alpha release notes, and corrected position of field lookup reference label. Thanks velmont and timo.
Backport of r11988 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 00:56:40 +00:00
Gary Wilson Jr a94d7e761f [1.1.X] Form wizard documentation tweaks:
* Simplified Sphinx references to FormWizard class.
  * Wrapped long lines.
  * Added references to template loader functions.

Backport of r11986 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-25 21:08:02 +00:00
Gary Wilson Jr f67cd98b3f [1.1.X] Added a few Sphinx directives to the form API and template API docs.
Backport of r11984 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-25 20:56:52 +00:00
Justin Bronn 94b718915d [1.1.X] Fixed #12438 -- now use `GEOSFree` to free string pointers allocated within GEOS when available; now parse out subminor version, and added a `GEOS_VERSION` tuple.
Backport of r11979 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-24 15:01:47 +00:00
Jannis Leidel 116ff7ff35 [1.1.X] Fixed #12425 - Typo in Ukrainian translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-24 14:29:59 +00:00
Luke Plant 1ab5f1cc00 [1.1.X] Fixed typo
Backport for r11961 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 17:54:04 +00:00
Luke Plant b0d779b1dd [1.1.X] Added info on top-level use of django.conf.settings to 'contributing' documentation
Backport of r11802 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11962 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 17:44:09 +00:00
Marc Fargas 859ac5be13 [1.1.X] Updated Spanish translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 16:18:54 +00:00
Marc Fargas 24b5489354 [1.1.X] Updated Catalan translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 16:18:30 +00:00
Russell Keith-Magee d0ea8f2d4c [1.1.X] Tweaked the model_formsets test to work around a weird sorting problem between versions of Postgres. Thanks to Alex Gaynor for the report.
Backport of r11953 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 15:57:45 +00:00
Karen Tracey d65af73db4 [1.1.X] Updated svnmerge metadata to reflect trunk changesets that have been and should not be applied to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 14:48:19 +00:00
Jannis Leidel cf49f62be3 [1.1.X] Fixed #8145 - Documented the codenames of the default auth permissions
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 14:37:24 +00:00
Russell Keith-Magee 7d6213e0aa [1.1.X] Fixed #11936 -- Removed deferred models from the list returned by the app_cache. Thanks to ryszard for the report, and clamothe for the initial patch.
Backport of r11938 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 11:20:43 +00:00
Luke Plant b15d762d7a [1.1.X] Fixed #10927 - Content Types shortcut view throws 500s instead of 404s
Thanks to Jeremy Dunck/Alex Gaynor for the patch

Backport of r11917 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:31:28 +00:00
Luke Plant c81f1da152 [1.1.X] Fixed #6961 - loaddata fails if models is a package instead of a module
Thanks to pmd for report, zhaoz, mmalone and justinlilly for patch

Backport of 11914 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:27:50 +00:00
Justin Bronn 281114d209 [1.1.X] Fixed #12234 -- Create additional indexes that use the appropriate operation class for PostgreSQL `varchar` and `text` columns when `db_index=True`.
Backport of r11912 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 08:24:20 +00:00
Russell Keith-Magee d10f9766ad [1.1.X] Fixed #12393 -- Parameterized the form output in the testGenericInlineFormset test to avoid database PK problems. Thanks to Karen for the report.
Backport of r11905 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 23:48:40 +00:00
Jacob Kaplan-Moss 321fe61f64 [1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
Backport of [11901].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 22:11:39 +00:00
Justin Bronn de2c7d9fdd [1.1.X] Fixed #12390 -- `Distance` and `Area` objects now support multiplication when they are the right-hand side.
Backport of r11898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 18:29:05 +00:00
Russell Keith-Magee de64970091 [1.1.X] Updated BaseGenericInlineFormSet to match the changes made to BaseInlineFormSet in r11874.
Backport of r11885 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 07:28:26 +00:00
Jarek Zgoda 3071d098db [1.1.X] Polish translations updated (some GIS keys still unresolved)
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 19:41:59 +00:00
Karen Tracey f4282336b3 [1.1.X] Fixed #12385: Made built-in field type descriptions in admindocs translatable again. Many thanks to Ramiro for the problem report and patch.
r11878 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 18:17:18 +00:00
Russell Keith-Magee 45bc45eac2 [1.1.X] Cleaned up some stray text in the test from r11874. Thanks to Rob Hudson for the eagle eyes.
Backport of r11876 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 15:16:21 +00:00
Russell Keith-Magee 632a0e9a8d [1.1.X] Fixed #10263 -- Added a queryset argument to BaseInlineFormSet, normalizing with BaseModelFormSet, and allowing for custom ordering/subsets in inlines. Thanks to Paulo Scardine for the patch.
Backport of r11874 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 14:53:42 +00:00
Karen Tracey eef4739dee [1.1.X] Made the message strings added in r11838 visible to makemessages. Refs #12281.
r11864 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14 16:05:28 +00:00
Karen Tracey fee560f4e5 [1.1.X] Fixed #10969: Made US State field a CharField, fixing a few oddities in its behavior. Thanks Paul McLanahan.
r11847 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 22:08:03 +00:00
Karen Tracey 64736fe37f [1.1.X] Fixed #12146: Corrected Canadian postal code validation. Thanks paulschreiber and Mark Lavin.
r11844 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 17:05:17 +00:00
Karen Tracey b5ffd10547 [1.1.X] Apply doc addition that somehow was left out of r11834. Refs #7977.
r11841 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 15:19:21 +00:00
Karen Tracey 08b5d95922 [1.1.X] Update an email address in AUTHORS.
r11839 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 22:08:27 +00:00
Karen Tracey 6c91e6ecbc [1.1.X] Fixed #12281: Added some helpful messages when Go is pressed in admin actions and there
is nothing to do because no action was selected or no items are selected. 

r11837 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 22:02:55 +00:00
Karen Tracey 31618e3ea4 [1.1.X] Fixed #11632: Fixed a test broken by r11827 that relied on the exact (invalid HTML) id of an initial hidden input field.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 20:55:46 +00:00
Karen Tracey fa59129753 [1.1.X] Fixed #7977: Fixed admindocs to use docstrings instead of a static array to locate type information. Thanks J. Clifford Dyer.
r11833 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 20:36:31 +00:00
Jacob Kaplan-Moss 7f1c309cac Removed a left-over empty test directory -- the perils of git-svn, apparently.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 19:39:04 +00:00
Jacob Kaplan-Moss d053631286 [1.1.X] Fixed the tests I broke with [11825].
Backport of r11828.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:48:20 +00:00
Karen Tracey 8bb3763c2b [1.1.X] Fixed #11632: Fixed the id for hidden initial widget so that it is different from the id for its visible counterpart. Thanks geber@datacollect.com and Mark Lavin.
r11826 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:22:09 +00:00
Jacob Kaplan-Moss c1a8bd6779 [1.1.X] Fixed #10130: you may now delete attributes on `settings`. Thanks, jcassee.
Backport of r11824.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:53:32 +00:00
Karen Tracey 5e6c3d24b3 [1.1.X] Fixed #11972: Corrected title filter handling of numbers followed by letters. Thanks schwank@gmail.com and Randy Barlow.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:29:46 +00:00
Brian Rosner 512ee70527 [1.1.X] Fixed edge case that breaks the test suite on versions of Python > 2.6.4
Before http://svn.python.org/view?view=rev&revision=74647 it was possible to
pass a SimpleCookie to load, but this no longer works due to a different bug
in Python the said revision fixed.

My guess is a SimpleCookie was never intended to be passed through load which
is perfectly reasonable.

Backport of r11820 from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 15:31:14 +00:00
Karen Tracey cf844fde9f [1.1.X] Update svnmerge metadata to reflect what has been backported and what should not be backported to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 13:07:13 +00:00
Brian Rosner 17350faeae [1.1.X] Adjusted URL to #django IRC logs
Backport of r11817 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 07:15:25 +00:00
Russell Keith-Magee 9275297046 [1.1.X] Fixed #11874 -- Optimizations and cleanups for SortedDict. Thanks to Alex Gaynor and Armin Ronacher for the report and patch.
Backport of r11815 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 06:02:42 +00:00
Karen Tracey 79d8d683d2 [1.1.X] Fixed #12349: Added missing unquote in admin history view. Thanks for the report guard.
r11808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-10 20:01:59 +00:00
Justin Bronn 58c19c324b [1.1.X] Fixed #12340 -- `BaseGenericInlineFormSet.get_queryset` now returns an ordered queryset.
Backport of r11800 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 04:24:05 +00:00
Russell Keith-Magee b24bb68649 [1.1.X] Cleaned up the release notes index page, and added some stub 1.1.2 and 1.2 release notes.
Backport of r11760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 13:52:59 +00:00
Jacob Kaplan-Moss fa5ff296ce [1.1.X] Added an explicit test showing that field errors are correctly autoescaped.
Backport of r11756 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-20 15:04:16 +00:00
James Tauber 2ea5e4c743 [1.1.X] Added myself to committers list
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 21:56:22 +00:00
Russell Keith-Magee 55b6f3cf21 Corrected an inconsistency in the documentation regarding the way to specify the locmem and dummy cache backend. Thanks to Jens Diemer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 11:20:06 +00:00
Russell Keith-Magee 47f1330be1 [1.1.X] Fixed #12242 -- Corrected a problem with masking extra selects() in a DateQuerySet. Thanks to Alex Gaynor for his help debugging this one.
Backport of r11748 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 04:37:26 +00:00
Brian Rosner 4cba436269 [1.1.X] Fixed #5034 -- honor request.urlconf in reverse and resolve.
This enables {% url %} to honor request.urlconf set from process_request
middleware methods.

Thanks SmileyChris for the initial patch work.

Backport of [11740] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-16 01:59:54 +00:00
Russell Keith-Magee 7f2f6bc863 [1.1.X] Fixed #12204 -- Corrected the use of :djadmin: links in the testing docs, plus updated a lot of old-style markup in the django-admin docs. Thanks to Art_S for the report.
Backport of r11734 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-12 13:59:35 +00:00