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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
6ec45f3cb4
[1.1.X] Fixed #12163 -- Corrected the unpickling of non-deferred models. Thanks to rfugger for the report and test case.
...
Backport of r11732 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-11 13:08:33 +00:00
abd4344efe
[1.1.X] Fixed #11144 -- When a to/from/cc header contains unicode, make sure the email addresses are parsed correctly (especially with regards to commas). Thanks to rmt for the patch.
...
Backport of r11719 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-04 11:28:56 +00:00
9a38c1cdb2
[1.1.X] Fixed #11849 -- Corrected handling of use_tls in the SMTP mail handler. Thanks to aromano for the report.
...
Backport of r11714 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-04 02:01:54 +00:00
a9c816c41b
[1.1.X] Fixed #12101 -- `OGRGeometry` does not need to create a clone of the `SpatialReference` object upon assignment.
...
Backport of r11707 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-03 06:18:52 +00:00
e3f07d2b4c
[1.1.X] Fixed #12127 -- Corrected teardown of dateformat tests. Thanks to apollo13 for the report, and Karen Tracey for the debugging help.
...
Backport of r11705 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-02 08:27:00 +00:00
30ebd268be
[1.1.X] Fixed #12093 -- `LayerMapping` now takes into account model inheritance when looking for the geometry column; forgot to diable extent regression test on MySQL.
...
Backport of r11703 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-02 02:24:01 +00:00
e114f4403a
[1.1.X] Repeat the setUp/tearDown changes made in r11699 for the tests
...
converted in r11694. This allows the dateformat tests to pass
on Windows.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 23:52:31 +00:00
13d83908a4
[1.1.X] Changed setUp and tearDown for the tests converted from doctests in r11695
...
to not assume TZ absolutely will be set in the environment. That environment
variable does not necessarily exist on Windows, it seems.
r11699 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 23:13:59 +00:00
8061665c27
[1.1.X] (In [11697]) Fixed #12125 -- Fixed a typo in the generic views date_based test that caused it to fail in November. Thanks brutasse.
...
r11697 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 22:16:14 +00:00
e109de3b7e
[1.1.X] Fixed #12123 -- Updated the utils.dateformat test to be a unittest too, due to a dependency on the old dateformat test.
...
Backport of r11695 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 04:54:56 +00:00
801a8925fa
[1.1.X] Fixed #12123 -- Refactored dateformat tests to use unittest. This is needed so that we have a reliable teardown that can reset the timezone at the end of the test.
...
Backport of r11693 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 04:21:37 +00:00
fe9a45e514
[1.1.X] Fixed #12121 -- Modified __reduce__ on a model to avoid an infinite recursion problem that occurs on Python 2.4. Thanks to emulbreh for the report.
...
Backport of r11691 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 03:06:44 +00:00
9e02b4a0e1
[1.1.X] Updated svnmerge metadata: block CSRF changesets, include those that have been backported in svnmerge-integrated.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-31 14:41:51 +00:00
53275a4775
[1.1.X] Fixed #11872 -- Instantiate the correct model in BaseInlineFormSet.__init__ when instance is None. Thanks tobias.
...
Backport of [11688] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 09:12:52 +00:00
a429943467
[1.1.X] Fixed #12115 -- Corrected typo in admin documentation. Thanks encinas.
...
Backport of [11686] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 08:49:56 +00:00
d45096437b
[1.1.X] Updated INSTALL file
...
setup.py does not require an Internet connection nor setuptools. That was
fixed in [3906].
Backport of [11684] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 08:24:45 +00:00
72933294d2
[1.1.X] Fixed #12057 -- Corrected regression of caching performance when a model contained a callable default. Thanks to Michael Thornhill for the excellent assistance tracking this problem.
...
Backport of r11681 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-29 14:36:10 +00:00
b1151bc2b3
[1.1.X] Added bio for myself
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-28 10:01:38 +00:00
ebe5405282
Added a no-op {% csrf_token %} tag to 1.1.X, to ease transition of apps to 1.2
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 21:50:58 +00:00
1ab0b23df6
[1.1.X] Fixed #11057 : having no actions in the admin (`actions=None`) no longer messes up the layout. Thanks, rvdrijst.
...
Backport of [11670] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 20:57:13 +00:00
97ee7a3baf
[1.1.X] Fixed #10996 - documented login CSRF vulnerabilities in the CsrfMiddleware
...
1.1.X branch only fix - trunk is completely different now.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 00:38:28 +00:00
d2b6f6c948
[1.1.X] Fixed #11961 : Corrected a few typos in docs/testing.txt. Thanks to timo for the patch.
...
Merge of r11599 from trunk.
Also updated svnmerge-integrated to reflect other changesets already backported,
and added a couple more that should not be merged to svnmerge-blocked.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:31:47 +00:00
88ec9d97cb
[1.1.X] Block new features and fixes from svnmerge to 1.1.X branch.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:15:17 +00:00
bf33627c63
[1.1.X] Fixed #11371 : Made `django.test.Client.put()` work for non-form-data PUT (i.e. JSON, etc.). Thanks, phyfus. Backport of [11656] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:04:32 +00:00
Karen Tracey
Jacob Kaplan-Moss
Brian Rosner
Russell Keith-Magee
Justin Bronn
James Tauber
Jannis Leidel
Luke Plant