innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
7,574 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

1481 Commits

Author SHA1 Message Date
Jacob Kaplan-Moss a9879b1438 [1.1.X] Fixed : work around PIL's installation brokeness by detecting either of the two ways it can end up being installed. 
Backport of [12429] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-14 18:33:01 +00:00
Russell Keith-Magee 166405b2e4 [1.1.X] Fixed -- Improved exception handling for the filesizeformat filter. Thanks to rfk for the report and patch. 
Backport of r12426 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:44:07 +00:00
Russell Keith-Magee f30a4b368c [1.1.X] Fixed -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch. 
Backport of r12425 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:43:33 +00:00
Russell Keith-Magee d751f2cade [1.1.X] Fixed -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch. 
Backport of r12423 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 14:06:13 +00:00
Russell Keith-Magee bf11ab2b21 [1.1.X] Fixed -- Modified the test client to preserve the request scheme on a redirect. Thanks to tgardner for the report and patch. 
Backport of r12419 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-13 12:32:01 +00:00
Russell Keith-Magee f764d7ffb1 [1.1.X] Fixed -- Modified db cache backend to use db backend functions for date conversion, avoiding problems under Jython. Thanks to Leo Soto for the report and patch. 
Merge of r12411 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-11 13:12:38 +00:00
Russell Keith-Magee d4a34b5508 [1.1.X] Fixed -- Corrected table name quoting in db cache backend. Thanks to Fraser Nevett for the report and fix. 
Backport of r12410 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-11 13:11:47 +00:00
Russell Keith-Magee 3792b2cd9f [1.1.X] Fixed -- Added handling for memcache timeouts longer than 30 days. Thanks to houdinihound for the report, and gciotta for the patch. 
Backport of r12408 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-11 13:09:56 +00:00
Karen Tracey ad08f07722 [1.1.X] Fixed : Corrected SQL generated for queries involving generic relations and ORed Q objects. Thanks to brianglass for report, tobias for fix and test, and Alex for review. 
r12405 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-10 19:24:44 +00:00
Jannis Leidel 01d4316874 [1.1.X] Fixed - Added ability to discard the language catalog in the JavaScript i18n view in case the selected language is English but no English translation catalog actual exists, e.g. due to being the language translated from. Thanks to msaelices, aryx and Ramiro Morales. 
Backport of r12384.


Conflicts:

	tests/regressiontests/views/tests/i18n.py

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-05 01:54:22 +00:00
Karen Tracey 88bd40c551 [1.1.X] Corrected app_loading test so it does not generate a key error when TZ is not set in the environment (e.g., on Windows). 
r12379 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-03 18:12:35 +00:00
Karen Tracey 4043521f53 [1.1.X] Fixed : Ensured objects with generic relations that use non-integer object ID fields can be deleted on PostgreSQL. Thanks much carljm for patch and Russ for review. 
r12353 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-29 18:02:35 +00:00
Russell Keith-Magee 4a1be98aee [1.1.X] Fixed -- Corrected handling of tag creation in feeds when the URL contains a port number. 
Partial backport of r12338 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-28 13:59:57 +00:00
Luke Plant a3f4402853 [1.1.X] Fixed - encoding of comma and semi-colon in cookies. 
This is a backport of r12282 from trunk.

The original bug was about CookieStorage, which does not exist in 1.1.X,
but the fix involved the underlying cookie storage.

The change fixes other bugs with cookies for Internet Explorer and Safari,
hence it is backported.  It could, however, also cause backwards
incompatibilities with existing javascript that may parse cookie values that
contain commas or semi-colons, and, very rarely, with existing cookie values
manipulated server side.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-23 23:25:41 +00:00
Justin Bronn da954e876b [1.1.X] Fixed -- Fixed `GenericRelation.m2m_reverse_name` to return the correct pk column name. 
Backport of r12276 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-22 19:43:14 +00:00
Karen Tracey 46d8ae7c24 [1.1.X] Fixed -- PostgreSQL 8.3+ no longer barfs when passing an integer as a filter() value for a CharField? or TextField?. Thanks, carljm 
Backport of r12150 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-19 16:55:22 +00:00
Jannis Leidel 3a417736bc [1.1.X] Fixed - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas. 
Backport of r12056.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-17 23:10:23 +00:00
Jannis Leidel d1e7fdea3f [1.1.X] Fixed - Overriding the default error message of the UKPostcodeField works again. Backport of r12044 and r12249. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-17 22:51:25 +00:00
Jannis Leidel dc3d26bb59 [1.1.X] Fixed - Properly hide SplitHiddenDateTimeWidget. Thanks to David Gouldin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-17 22:11:23 +00:00
Jannis Leidel 889c110e51 [1.1.X] Fixed - Give MultipleHiddenInput different IDs. Thanks Chris Beaven. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-17 22:11:00 +00:00
Jannis Leidel 3a6f58a169 [1.1.X] Fixed - Let TimeField.to_python correctly return a datetime.time object when having a datetime object. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-17 22:09:33 +00:00
Karen Tracey 2986dc7b28 [1.1.X] Fixed code duplication caused in [11859]. 
r12048 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-17 20:47:35 +00:00
Karen Tracey 9041b1addf [1.1.X] Changed an i18n test to use a number that converts consistely from string to float on Pythons up to 2.7. 
r12144 from trunk, backported to the doctest version where the change is needed for the test to pass on Python 2.7 alpha 2.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-09 21:03:25 +00:00
Karen Tracey 03d57f0a82 [1.1.X] Fixed : Made Platypus just a tad lighter so it does not trigger noticing version-dependent differences in Ptyhon string/float conversions. 
r12132 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-09 19:20:51 +00:00
Luke Plant 3de16688a9 [1.1.X] Fixed - 'lazy' fails when there are multiple expected classes with the same method 
Thanks to Alex for report and patch

Backport of r12104 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-05 13:20:19 +00:00
Gary Wilson Jr 07fa03dde4 [1.1.X] Fixed -- Changed test runners to use an exit status code of 1 for any number of failed tests. The previous behavior of using an exit status code equal to the number of failed tests produced incorrect exit status codes when the number of test failures was 256 or greater. Thanks to lamby for the report and patch. 
Backport of r12068 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-03 18:57:15 +00:00
Russell Keith-Magee e8b001f46f [1.1.X] Fixed -- Forced the rollout of generators passed to SortedDict so that the data source can be read twice. Thanks to gsf for the report, and Alex for the patch. 
Backport of r12064 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-03 06:56:10 +00:00
Luke Plant 58bf653a26 [1.1.X] Fixed - Admin throws 500 instead of 404 for PK of incorrect type 
Thanks to mmachine for report and test, and Chris Beaven for the patch

Backport of r12011 from trunk



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-28 14:15:34 +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
Russell Keith-Magee 7d6213e0aa [1.1.X] Fixed -- 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 - 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 - 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
Russell Keith-Magee d10f9766ad [1.1.X] Fixed -- 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 - 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
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
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 -- 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 fee560f4e5 [1.1.X] Fixed : 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 : 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 6c91e6ecbc [1.1.X] Fixed : 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 : 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
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 : 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 : 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 : 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
Karen Tracey 79d8d683d2 [1.1.X] Fixed : 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 -- `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
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
Russell Keith-Magee 47f1330be1 [1.1.X] Fixed -- 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 -- 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