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

1471 Commits

Author SHA1 Message Date
Luke Plant 7d0d3b68d6 Fixed bug and test failure introducted in [14290] 
Thanks Russell for alerting me.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 07:59:17 +00:00
Jannis Leidel cfc19f84de Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-20 01:33:24 +00:00
Luke Plant 46c17654ed Fixed #14498 - Forms passed to FormWizard.process_step are not guaranteed to have cleaned_data 
Thanks to stas for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 20:45:40 +00:00
Honza Král f6a0b7cfe3 Fixed #14407 -- Simplified ManyToManyRawIdWidget.value_from_datadict, Thanks tyrion! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 07:14:38 +00:00
Honza Král 31560e31f9 Fixed #13790 -- auto detection of m2m fields to Site. Thanks, gabrielhurley! 
Tests are placed in the test suite and not the contrib app since they require
models to work

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-18 04:56:27 +00:00
Jannis Leidel 214dc97bf3 Fixed #13963 -- Use the correct verbose name of a reverse relation field in the admin. Thanks, sfllaw and d0ugal. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-17 15:17:52 +00:00
Alex Gaynor 5a8e40a03f Fixed #11350 -- added an Israeli localflavor. Thanks to Yuval and Idan Gazit for their work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-15 02:58:10 +00:00
Luke Plant 45c7f427ce Fixed #14445 - Use HMAC and constant-time comparison functions where needed. 
All adhoc MAC applications have been updated to use HMAC, using SHA1 to
generate unique keys for each application based on the SECRET_KEY, which is
common practice for this situation. In all cases, backwards compatibility
with existing hashes has been maintained, aiming to phase this out as per
the normal deprecation process. In this way, under most normal
circumstances the old hashes will have expired (e.g. by session expiration
etc.) before they become invalid.

In the case of the messages framework and the cookie backend, which was
already using HMAC, there is the possibility of a backwards incompatibility
if the SECRET_KEY is shorter than the default 50 bytes, but the low
likelihood and low impact meant compatibility code was not worth it.

All known instances where tokens/hashes were compared using simple string
equality, which could potentially open timing based attacks, have also been
fixed using a constant-time comparison function.

There are no known practical attacks against the existing implementations,
so these security improvements will not be backported.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-14 20:54:30 +00:00
Luke Plant 5bf73dd909 Fixed reference to removed function root() in AdminSite docstring. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-14 01:24:20 +00:00
Honza Král b7ed25a0f3 Fixed #14017 -- wrong comment on log_deletion method of ModelAdmin 
Also added a transaction around the deletion view to preserve DB state (and rollback the creation of LogEntry object in case the deletion fails)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-13 04:16:31 +00:00
Justin Bronn 2c3b710d0a Fixed #13830 -- Updated province name in Indonesian localflavor. Thanks, rodin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-13 01:23:07 +00:00
Justin Bronn 120aae2209 Enabled area calculations for geography columns. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 17:13:27 +00:00
Russell Keith-Magee 03f00bcd42 Fixed #14447 -- Modified the auth and sitemaps tests to remove some assumptions about the environment in which the tests are run. Thanks to Gabriel Hurley for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 07:15:47 +00:00
Chris Beaven e509c1527a Fixed #14425 -- Unused imports in contrib.admin. Thanks robhudson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-12 01:03:53 +00:00
Jannis Leidel 6ddfe26932 Fixed #14349 -- Added Belgium localflavor. Thanks for the report and patch, Laurent Luce. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 23:35:23 +00:00
Luke Plant e0ec458360 Fixed #14433 - replaced a thread-unsafe solution to #10235 introduced in [13980] 
This patch also addresses sitemap code found in contrib/gis, which [13980]
did not.

Thanks to gabrielhurley for the initial patch.

Refs #10235, #14386

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 14:34:42 +00:00
Russell Keith-Magee 121d2e3678 Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:55:17 +00:00
Russell Keith-Magee 1070c57b83 Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:20:07 +00:00
Alex Gaynor 5e5be2c44c Fixed #14279 -- Corrected a typo in the sitemaps tests (didn't affect the passage of the test). Thanks to jamesodo for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 03:39:02 +00:00
Alex Gaynor 791cc62d4c Don't mark a TemplateSyntaxError in flatpages as being translatable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 17:54:20 +00:00
Andrew Godwin c236d5e44d Fixed #14193: prepopulated_fields javascript now concatenates in correct order. Thanks to bmihelac for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 09:57:23 +00:00
Ramiro Morales d084439c41 Fixed #12650 -- Don't generate invalid XHTML in the admin, databrowse apps when 
the i18n context processor is active. Thanks to Rob Hudson for the report and
fix suggestion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 01:57:56 +00:00
Luke Plant 05d438bdd9 Converted contrib/webdesign doctests to unittests. We thoroughly deplore those doctests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 01:06:56 +00:00
Luke Plant f3429da6a0 Converted contrib/auth/tokens doctests to unittests. We've always said "no more" to doctests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 01:06:42 +00:00
Russell Keith-Magee 03e7d64de4 Ensure that the sitemaps test deactivates it's locale, so that subsequent tests aren't run in French. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 14:36:18 +00:00
Russell Keith-Magee a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 08:12:50 +00:00
Ramiro Morales 8058cc2e25 Fixed #12872 -- Removed vestiges of mythic old template validation admin app functionality. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 03:58:32 +00:00
Russell Keith-Magee 8755fb1549 Fixed #14354 -- Normalized the handling of empty/null passwords in contrib.auth. This also updates the createsuperuser command to be more testable, and migrates some auth doctests. Thanks to berryp for the report, and Laurent Luce for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 03:34:08 +00:00
Russell Keith-Magee 127a25ac27 Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 15:37:16 +00:00
Russell Keith-Magee ed32170a04 Fixed #13218 -- Ensure that syndicated content served over HTTPS uses https:// links by default. Thanks to schaefer for the report, and Ben Firshman for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 14:14:05 +00:00
Russell Keith-Magee f53491db6e #14374 -- Added some missing template files to ensure that contrib.auth tests will pass when admin isn't installed. Thanks to henriquebastos for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 13:50:54 +00:00
Luke Plant 2faa490aeb Fixed #5425 - Incorrect plurals in admin pagination template. 
Thanks to Petr Marhoun for the report, and mk for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-07 22:30:38 +00:00
Adrian Holovaty 157583f916 Fixed #14412 -- Pointed contrib.comments comments-url-redirect URLpattern at the actual view instead of the deprecated view. Thanks, subsume 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-06 22:56:52 +00:00
Adrian Holovaty 47cae1a2f6 Fixed #14414 -- Improved contenttypes shortcut() view to check that the ContentType has a model_class(). Thanks, subsume 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-06 22:55:06 +00:00
Luke Plant 667d832e90 Fixed #14386, #8960, #10235, #10909, #10608, #13845, #14377 - standardize Site/RequestSite usage in various places. 
Many thanks to gabrielhurley for putting most of this together.  Also to
bmihelac, arthurk, qingfeng, hvendelbo, petr.pulc@s-cape.cz, Hraban for
reports and some initial patches.

The patch also contains some whitespace/PEP8 fixes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-04 14:20:47 +00:00
Jannis Leidel 941e11e54d Fixed #14363 -- Fixed render method of ManyToManyRawIdWidget to set attrs to an empty dict. Thanks, tyrion and dpn. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:31:05 +00:00
Jannis Leidel 113b0bde66 Fixed #14362 -- Made sure all parameters are passed to the ManyToManyRawIdWidget. Thanks, tyron. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:30:45 +00:00
Jannis Leidel 524b6bae29 Fixed tabs introduced in r13968. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:05:45 +00:00
Jannis Leidel 392d992f82 Fixed #7048 -- Added ClearableFileInput widget to clear file fields. Thanks for report and patch, jarrow and Carl Meyer. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-01 02:02:58 +00:00
Justin Bronn ea07fe7a3f Fixed a geographic sitemaps regression introduced in r13876. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-27 00:20:42 +00:00
Jannis Leidel 1df1378f9e Fixed #13827 -- Cleaned up a few unnecessary function calls. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-26 21:36:22 +00:00
Luke Plant 763bcf8472 Fixed paste-o in [13855] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-14 21:40:23 +00:00
Luke Plant 34a4af50be Fixed #2283 (again) - comment form templates don't validate as XHTML 
Thanks to hjoreteg/thejaswi_puthraya for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-14 14:22:35 +00:00
Luke Plant 86031bf59d Fixed #14252 - django.contrib.flatpages unit tests assume default value for settings.LOGIN_URL 
Thanks to pmclanahan for report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-13 23:09:56 +00:00
Malcolm Tredinnick 4084bc7354 Permit custom from-email address in auth forms email. 
Patch from cassidy and Rob Hudson. Fixed #11300.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 22:38:01 +00:00
Justin Bronn 553374b55d Fixed #14060 -- PostGIS never implemented the `~=` operator for geography types, so removed support for it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 02:07:04 +00:00
Justin Bronn f6074506fd Fixed regression in running the GeoDjango test suite after r13670 with addition of `GeoDjangoTestSuiteRunner` (replaces `run_gis_tests`, which is now a stub). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 01:40:42 +00:00
Justin Bronn 9e04c3b744 Fixed #13149 -- The admin `ForeignKeyRawIdWidget` now properly handles non-integer values. Thanks, Chris Adams. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 18:34:40 +00:00
Justin Bronn 04f50c1f28 Fixed #13599 -- No longer embed hidden `<td>` elements in `ChangeList` that cause improper rendering when `list_editable` is enabled; refactored `admin_changelist` tests. Thanks, skevy for bug report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 03:01:07 +00:00
Karen Tracey 5912903852 Fixed #11358: Don't include private flatpages in sitemap. Thanks dburke and mlavin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-10 23:30:46 +00:00