Commit Graph

4254 Commits

Author SHA1 Message Date
Jannis Leidel 75a9c8a5ef Fixed #10793 -- Stopped caching paginator instances in sitemap classes to prevent stale sitemaps. Thanks, gnosek, krzysiumed and adam_przybyla.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:56:49 +00:00
Aymeric Augustin f9ec6bd3df Documented the new version numbering scheme introduced in r17357.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 08:37:33 +00:00
Aymeric Augustin 175e6d77df Fixed #11745 -- Grouped commands by application in the output of `manage.py help`. Made 'version' consistent with 'help' while I was in the area, and added tests. Thanks Jannis for the feedback and review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-07 18:46:29 +00:00
Ramiro Morales 09ad6d1b88 Fixed a couple of minor errors in the django-admin(1) Unix man page.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-06 02:00:19 +00:00
Timo Graham 0ccbb5356a Fixed #17571 - Fixed documentation of skipUnlessDBFeature; thanks EnTeQuAk for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-05 15:53:09 +00:00
Timo Graham 9f95d79cee Fixed #17510 - Typo in docs/topics/class-based-views.txt; thanks andrew and noria.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-05 15:41:33 +00:00
Jannis Leidel 62dc16dcd8 Fixed #17625 -- Mention in the management command docs that modules with an underscore prefix are ignored and not dissplayed in the list of commands.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 18:27:14 +00:00
Jannis Leidel 52d72a5a3e Fixed #17182 -- Changed best practice documentation for Form.clean to use super() instead of relying on self.cleaned_data. Thanks, DrMeers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 16:05:30 +00:00
Jannis Leidel faeee611d6 Fixed #17517 -- Added `--name` option to startproject and startapp management commands to be able to render files without a file extension. Thanks, Florian Apolloner.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 13:01:30 +00:00
Jannis Leidel 954e3b4ad3 Fixed #13914 -- Added natural keys to User and Group models in auth contrib app. Thanks, jbochi and closedbracket.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 12:48:01 +00:00
Adrian Holovaty 6ecadcbdd2 Made a bunch more edits up until [17418]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 20:45:45 +00:00
Adrian Holovaty 00227b6529 Edited serialization.txt changes from [17355]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 20:16:06 +00:00
Adrian Holovaty 20106af74d Edited releases/1.4.txt changes from [17354]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 20:14:14 +00:00
Adrian Holovaty e2e3d4da0c Edited releases/1.4.txt changes from [17353]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 20:13:16 +00:00
Adrian Holovaty 6bbc85cd6a Edited db/transactions.txt changes from [17341]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 17:54:08 +00:00
Adrian Holovaty f950a99acb Edited django-admin.txt changes from [17340]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 17:52:39 +00:00
Adrian Holovaty 442ab475c8 Edited deployment doc changes from [17338]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 17:51:14 +00:00
Adrian Holovaty ead8a869ce Edited models/options.txt changes from [17314]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 17:45:28 +00:00
Carl Meyer 844a24bbb9 Fixed #16921 -- Added assertHTMLEqual and assertHTMLNotEqual assertions, and converted Django tests to use them where appropriate. Thanks Greg Müllegger.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-31 20:36:11 +00:00
Carl Meyer a678e9ea65 Fixed #17604 - Added context-manager capability to assertTemplateUsed and assertTemplateNotUsed. Thanks Greg Müllegger.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-31 19:23:09 +00:00
Julien Phalip f1dc83cb98 Fixed #10868 -- Stopped restoring database connections after the tests' execution in order to prevent the production database from being exposed to potential threads that would still be running. Also did a bit of PEP8-cleaning while I was in the area. Many thanks to ovidiu for the report and to Anssi Kääriäinen for thoroughly investigating this issue.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-30 08:27:50 +00:00
Chris Beaven b5d0cc9091 Add a mention in the startproject docs section that --template can take a URL
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-29 21:39:39 +00:00
Aymeric Augustin a4b472dd80 Fixed #8995 -- Added support for HTTPS in sitemaps.
Modularized tests and did a bit of cleanup while I was in the area.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-29 19:24:32 +00:00
Aymeric Augustin 123f567093 Fixed #2713 -- Made the name of the sitemap view a parameter of the sitemap index view, in order to allow decorators. Also cleaned up code in the area and removed redundant comments from the tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-29 09:30:28 +00:00
Aymeric Augustin 1cc800783c Fixed #5968 -- Allowed (un-)registering with databrowse several models at once.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-28 20:54:48 +00:00
Julien Phalip ef926192fd Updated my bio.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-25 16:43:52 +00:00
Ramiro Morales 332b248be8 Added note about deprecation of project-level translations to the deprecation timeline document.
Thanks Jannis for the report. Fixes #17588.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-25 14:26:46 +00:00
Aymeric Augustin 58346e92fa Fixed #17572 —— A few grammar errors in the comments framework example page.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-21 15:42:37 +00:00
Aymeric Augustin f0d4676750 Fixed #10139 -- Clarified that slicing an evaluated QuerySet returns a list, not a QuerySet. Thanks ori for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-21 15:32:52 +00:00
Ramiro Morales c35399ba0d Updated link to Django Debug Toolbar homepage.
Thanks to rowynm AT gmail DOT com for the report and to Claude Paroz for
the patch.

Fixes #17543.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-15 03:27:48 +00:00
Ramiro Morales 665ec600a4 Made email attachment handling code accept non-ASCII filenames.
Thanks to Anton Chaporgin for the report and to Claude Paroz for the patch.

Fixes #14964.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-15 02:33:31 +00:00
Ramiro Morales e308cfc0e1 Added support for specifying initial values to model formsets and inline formsets.
This make them consistent with the similar capability of regular
formsets. Thanks to simon29 form the report and to Claude Paroz for the
patch.

Fixes #14574.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-15 01:36:14 +00:00
Adrian Holovaty 64229eb388 Started a 'Cheat sheet' section in aggregation docs because I desperately need this
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-13 21:57:30 +00:00
Carl Meyer 4c16e77230 Fixed #17538 -- corrected the section in tutorial 3 about the handler404 default. Thanks matt at brozowski dot com for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-12 22:03:34 +00:00
Luke Plant e1ba9111ac Fixed #17526 - unnecessary comma in 'Please, see the release notes' removed
Thanks to datakid for the report

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-11 10:19:05 +00:00
Aymeric Augustin 4288c8831b Fixed #10762, #17514 -- Prevented the GZip middleware from returning a response longer than the original content, allowed compression of non-200 responses, and added tests (there were none). Thanks cannona for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-09 21:42:03 +00:00
Aymeric Augustin 62766f4248 Reverted parts of r17359 that could cause false positives in URL detection, especially on file names.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-08 21:36:22 +00:00
Aymeric Augustin 05a3ecbf96 Fixed #16656 -- Changed the urlize filter to accept more top-level domains.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-08 16:08:43 +00:00
Aymeric Augustin d101ed2cb8 Fixed #16364 -- Clarified why automatically created data shouldn't be saved in fixtures. Thanks Gabriel for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-07 21:52:07 +00:00
Aymeric Augustin c51c9b3ce6 Moved two paragraphs from "deprecated features" to "backwards-incompatible changes", where they belong.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-07 21:47:38 +00:00
Aymeric Augustin cd46863043 Added missing bits of r17352. Refs #17513.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-07 21:42:37 +00:00
Aymeric Augustin e3a7bfccbb Fixed #9655 -- Prevented the urlize template filter from double-quoting URLs. Thanks Claude Paroz for writing the tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-07 18:15:28 +00:00
Aymeric Augustin c3697a091b Fixed #10756 -- Error in the formats accepted by PLNIPField. Thanks remik for the report, michalm for the patch and claudep for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-07 11:17:44 +00:00
Ramiro Morales 33f839b252 Moved misplaced documentation warning note about internal QuerySet query atribute.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-06 17:15:15 +00:00
Ramiro Morales 8312b85c97 Added support for savepoints to the MySQL DB backend.
MySQL provides the savepoint functionality starting with version 5.0.3
when using the MyISAM storage engine.

Thanks lamby for the report and patch.

Fixes #15507.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-05 00:45:31 +00:00
Carl Meyer bc63ba700a Fixed #17503 -- A destination directory passed to startproject or startapp as optional second argument is now reused as the project/app directory, rather than a new project/app directory created within it. Refs #17042.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-04 23:55:34 +00:00
Carl Meyer 8e9043bccb Clarified deployment docs to avoid giving users the impression that staticfiles should be used to actually serve files in production.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-04 18:08:13 +00:00
Aymeric Augustin 8af9084495 Fixed #17490 -- Added a trailing comma in INSTALLED_APPS, to avoid unexpected string concatenation when adding another app.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-02 11:19:06 +00:00
Timo Graham 068dcbddb9 Fixed #11986 - Added sudo to Mac OS permissions note in tutorial.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-31 15:34:49 +00:00
Timo Graham 72793766a7 Fixed #640 - Documented that changing order_with_respect_to requires a schema change; thanks fcurella and poirier for the draft patches.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-31 15:30:22 +00:00
Timo Graham 060783d52d Fixed #702 - Documented that ManyToMany fields can't be in unique_together; thanks poirier for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-31 00:43:11 +00:00
Adrian Holovaty 9fe578c212 Added a bit to the 1.4 release notes about the new SECURE_PROXY_SSL_HEADER setting
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 21:13:53 +00:00
Adrian Holovaty d4f11eb776 Fixed incorrect 'setting::' prefix in settings.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 21:13:08 +00:00
Adrian Holovaty 67f7756000 Edited release-process.txt changes from [17300]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 20:39:08 +00:00
Adrian Holovaty 937213c2c3 Edited csrf.txt changes from [17299]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 20:36:54 +00:00
Adrian Holovaty ffb0519d44 Edited testing.txt changes from [17289]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 20:34:07 +00:00
Adrian Holovaty 32ee74f89e Edited testing.txt changes from [17283]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 20:29:27 +00:00
Adrian Holovaty 103890561b Moved 'User-requested password resets' docs from [17266] from auth docs to admin docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 20:23:26 +00:00
Adrian Holovaty f2dcca6631 Edited docs/releases/1.4.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 19:18:03 +00:00
Adrian Holovaty de697769b7 Edited doc changes from [17246]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 18:14:31 +00:00
Adrian Holovaty d3ef13044e Edited doc changes from [17244]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 18:01:34 +00:00
Timo Graham afb21094a9 Fixed #17068 - Documented that documentation fixes will be more freely backported.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 15:30:51 +00:00
Aymeric Augustin 39201d8fe5 Fixed #16704 -- Documented how to insert the CSRF token outside of Django's own template engine. Thanks paulcwatts and bpeschier for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 14:55:44 +00:00
Timo Graham ca984aa50a Fixed #17334 - Documented the commit message style for backports; thanks krzysiumed for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 12:52:49 +00:00
Timo Graham 067352ec02 Fixed #17470 - Broken links in 0.95/0.96 release notes; thanks fastinetserver for the report; aaugustin for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 12:21:40 +00:00
Julien Phalip 0bf2d33770 Added the ability to specify multiple ports available for the `LiveServerTestCase` WSGI server. This allows multiple processes to run the tests simultaneously and is particularly useful in a continuous integration context. Many thanks to Aymeric Augustin for the suggestions and feedback.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-29 20:22:13 +00:00
Julien Phalip ec07a30e82 Indicated the exact version that is required to use the "WebDriverWait" example in the testing doc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-29 07:28:21 +00:00
Julien Phalip a343a84ce6 Added the `wait_until()` and `wait_loaded_tag()` methods to `AdminSeleniumWebDriverTestCase` to prevent some concurrency issues with in-memory SQLite database access in the admin Selenium tests. Thanks to Florian Apolloner, Anssi Kääriäinen and Aymeric Augustin for their help debugging this problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-28 22:20:30 +00:00
Aymeric Augustin 4403ce10b7 Removed a redundant paragraph from the templates builtins doc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 20:48:19 +00:00
Aymeric Augustin 4c445fdfaa Fixed #17110 -- Mentionned that the {% filter %} tag doesn't support the 'safe' and 'escape' filters. Thanks benspaulding.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 20:45:58 +00:00
Timo Graham fe876f0119 Fixed #17442 - Broken link in refs/templates/builtins.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 11:58:49 +00:00
Luke Plant 1c16907199 Added a password reset link to default admin login page if a password reset URL is available.
You no longer have to override the admin login page just to get that link to
appear!

Also provided much better docs for how to plug in the provided password
reset mechanism with minimum effort.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-24 00:14:45 +00:00
Gabriel Hurley 14ba0df3d0 Cleanup of typos, links, etc. in timezone docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 19:18:44 +00:00
Jannis Leidel 6fcbe90954 Minor fixes to the release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 19:13:10 +00:00
Gabriel Hurley 27f5fefc54 Fixed #17454 -- corrected year in release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 18:46:29 +00:00
Jannis Leidel 2a9ae71780 Fixed various links in the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 12:19:05 +00:00
Paul McMillan 2d1a681f77 Added password hashing improvements to 1.4 alpha 1 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17258 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 05:00:51 +00:00
James Bennett 0e29e48c05 Bump to 1.4 alpha 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 04:00:26 +00:00
Paul McMillan dce820ff70 Renovated password hashing. Many thanks to Justine Tunney for help with the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 03:46:06 +00:00
Gabriel Hurley a976159db0 Corrections and improvements to the 1.4 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 01:49:32 +00:00
Jannis Leidel a9a0f0b03f Fixed #17042 -- Extended startproject and startapp management commands to better handle custom app and project templates. Many thanks to Preston Holmes for his initial patch and Alex Gaynor, Carl Meyer, Donald Stufft, Jacob Kaplan-Moss and Julien Phalip for code reviewing.
* Added ability to pass the project or app directory path as the second argument
* Added ``--template`` option for specifying custom project and app templates
* Cleaned up admin_scripts tests a little while I was there

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 22:38:02 +00:00
Ramiro Morales 287565779d Added support for modifying the effect of ``DISTINCT`` clauses so they
only consider some fields (PostgreSQL only).

For this, the ``distinct()`` QuerySet method now accepts an optional
list of model fields names and generates ``DISTINCT ON`` clauses on
these cases. Thanks Jeffrey Gelens and Anssi Kääriäinen for their work.

Fixes #6422.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 20:42:40 +00:00
Jacob Kaplan-Moss 2f18d8b4b0 Added 1.4 alpha release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 20:18:54 +00:00
Julien Phalip 2f02a05ffb Fixed #2879 -- Added support for the integration with Selenium and other in-browser testing frameworks. Also added the first Selenium tests for `contrib.admin`. Many thanks to everyone for their contributions and feedback: Mikeal Rogers, Dirk Datzert, mir, Simon G., Almad, Russell Keith-Magee, Denis Golomazov, devin, robertrv, andrewbadr, Idan Gazit, voidspace, Tom Christie, hjwp2, Adam Nelson, Jannis Leidel, Anssi Kääriäinen, Preston Holmes, Bruno Renié and Jacob Kaplan-Moss.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 08:33:58 +00:00
Jannis Leidel 39109b0e44 Fixed Sphinx warning.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-21 11:05:43 +00:00
Aymeric Augustin 295fd50752 Fixed a typo in the model fields reference.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-20 17:03:13 +00:00
Julien Phalip 355f7fc564 Fixed #17163 -- Added the `NamedUrlWizardView.get_step_url()` method. Thanks, Bradley Ayers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 13:36:32 +00:00
Julien Phalip 1ef6841cad Fixed #17162 -- Removed the useless `WizardView.get_wizard_name()` method. Thanks, Bradley Ayers and Stephan Jaekel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 13:13:41 +00:00
Julien Phalip ed56e2c4a8 Fixed #17151 -- Renamed `wizard_prev_step` to the clearer `wizard_goto_step` in `NamedUrlWizardView`. Thanks, Bradley Ayers and Stephan Jaekel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 12:58:18 +00:00
Julien Phalip 3e790ae632 Fixed #17148 -- Fixed the signature of `WizardView.get_context_data()` to play nicer with mixin inheritance. Thanks, Bradley Ayers and Stephan Jaekel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 12:11:12 +00:00
Ramiro Morales 5a48cb5f61 Added note about assertFieldOutput being new in 1.4.
Thanks dpifke for report and patch.

Fixes #17433

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 11:53:16 +00:00
Adrian Holovaty 8767439af4 Converted some of the built-in views to use content_type instead of mimetype HttpResponse argument. Refs #16519
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 03:53:25 +00:00
Adrian Holovaty d3055b3382 Quick edit of docs/topics/security.txt to catch some basic formatting problems and reword an awkward section
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 02:48:27 +00:00
Adrian Holovaty fefbb66bac Fixed #17322 -- Added an example import statement to the HttpResponse docs. Thanks, RoySmith
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 02:19:14 +00:00
Adrian Holovaty 1bf58154f7 Fixed #17330 -- Fixed error in logging.txt. Thanks, jblaine
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 02:15:01 +00:00
Adrian Holovaty 2494dd25f5 Fixed #17364 -- Fixed typos in topics/testing.txt. Thanks, movielady
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 02:03:56 +00:00
Adrian Holovaty a848ef4e57 Fixed #17423 -- Fixed three typos in GeoDjango docs. Thanks, DavidEklund
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 02:00:20 +00:00
Adrian Holovaty 3f003a3c4b Fixed #17323 -- Renamed HttpRequest.raw_post_data to request.body. Thanks for the patch, dstufft
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17210 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-16 23:40:32 +00:00
Adrian Holovaty 61f0aff811 Fixed #14597 -- Added a SECURE_PROXY_SSL_HEADER setting for cases when you're behind a proxy that 'swallows' the fact that a request is HTTPS
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-16 22:06:06 +00:00
Julien Phalip 34e248efec Fixed #17258 -- Moved `threading.local` from `DatabaseWrapper` to the `django.db.connections` dictionary. This allows connections to be explicitly shared between multiple threads and is particularly useful for enabling the sharing of in-memory SQLite connections. Many thanks to Anssi Kääriäinen for the excellent suggestions and feedback, and to Alex Gaynor for the reviews. Refs #2879.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-16 13:40:19 +00:00
Ramiro Morales e7b5e22484 Expanded section about lazy translation in i18n docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-15 11:04:57 +00:00
Aymeric Augustin 219b41cc15 Fixed #17266 -- Skipped the "SET TIME ZONE" query for PostgreSQL when it isn't necessary.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-11 08:19:04 +00:00
Adrian Holovaty 594a45ed29 Fixed some comma splices in the 'Insert in bulk' section of db/optimization.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-09 23:14:04 +00:00
Aymeric Augustin 19cbdf8c8f Fixed #17348 -- Implemented {% elif %}. Refs #3100.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-09 22:13:27 +00:00
Adrian Holovaty 804a38c369 Made some small clarifications to contrib/admin/index.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-09 20:46:10 +00:00
Adrian Holovaty 346324f131 Tweaked templates/builtins.txt to make it clearer that cycle and firstof filters don't auto-escape. Refs #10912
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-09 19:53:06 +00:00
Adrian Holovaty 08bec4fbc1 Changed BoundField.subwidgets() to return SubWidget objects instead of rendered strings. This means we can access individual radio buttons' properties in the template (see new docs)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-07 23:08:27 +00:00
Adrian Holovaty fc90c09efd Made BoundFields iterable, so that you can iterate over individual radio buttons of a RadioSelect in a template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-07 22:31:39 +00:00
Aymeric Augustin 0519adb2a8 Clarified which setting causes HttpRequest.get_host() to rely on the HTTP_X_FORWARDED_HOST header.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-07 19:42:50 +00:00
Aymeric Augustin e42360b56b Added a versionadded directive for the 'admin_urlname' filter introduced at r16857.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-03 19:15:12 +00:00
Luke Plant 0d0f874d21 Punctuation fix in the 1.4 release notes
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-29 14:20:23 +00:00
Luke Plant 16ad0530c5 Clarified release note about the removal of 'mixin' parameter to Storage.open, and added a note in the deprecation timeline.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-29 12:01:38 +00:00
Aymeric Augustin 6bfae3de7c Fixed #17309 -- Typo in the IGNORABLE_404_URLS example.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-28 19:41:58 +00:00
Aymeric Augustin 7872fc0dab Fixed #16247 -- Removed wildcard expansion of application names in INSTALLED_APPS.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-27 20:13:37 +00:00
Aymeric Augustin 9c41437798 Fixed a typo in the layermapping docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-26 08:43:43 +00:00
Aymeric Augustin 268d737558 Fixed #16277 -- Changed the link to the IRC logs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-25 19:40:46 +00:00
Luke Plant e954a03871 Added warning about the performance of large IN clauses in prefetch_related docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-24 17:18:56 +00:00
Julien Phalip 648adcd35f Fixed #17285 -- Fixed a small typo in SimpleTemplateResponse's doc. Thanks, yorkedork.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-24 13:17:24 +00:00
Paul McMillan e13dc49053 Improved release notes about session cookie httponly flag (#16847) per Luke's comments.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-22 01:05:14 +00:00
Timo Graham 98f5127fb8 Fixed #17220 - Documented git clone command for git < 1.6.6; thanks krzysiumed for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 23:40:11 +00:00
Timo Graham f2d02647fa Fixed #16851 - Added how-to access form field value in template; thanks yasar11732 for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 23:33:39 +00:00
Paul McMillan 0506facd86 Fixed #16378. Locmem now uses pickle.HIGHEST_PROTOCOL for better compatibility with other hash backends. Thanks aaugustin for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 22:25:49 +00:00
Paul McMillan 4d975b4f88 Fixed #16847. Session Cookies now default to httponly = True.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 22:03:03 +00:00
Aymeric Augustin c5a899b190 Fixed #16787 -- Restored the ability to {% load %} template tags libraries within packages. Thanks Ivan Sagalaev for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 10:28:12 +00:00
Julien Phalip aa5230c4be Fixed #17269 -- Corrected the model options doc to indicate that, since 1.4, all fields in `Meta.ordering` are honored by the admin. Thanks to sebastian for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 06:07:24 +00:00
Aymeric Augustin 1240c8332d Fixed #17267 -- Clarified the description of MyISAM's lack of support for foreign keys.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-20 10:31:22 +00:00
Aymeric Augustin 9c30d48b45 Fixed #17263 -- Added a warning when a naive datetime reaches the database layer while time zone support is enabled.
After this commit, timezones.AdminTests will raise warnings because the sessions contrib app hasn't been upgraded to support time zones yet.
This will be fixed in an upcoming commit.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 23:27:20 +00:00
Timo Graham 9b8e211dd3 Fixed #17028 - Changed diveintopython.org -> diveintopython.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 22:57:20 +00:00
Karen Tracey c8c71057aa Fix #15646: Document that a FileField's full path can't be relied upon until its model has been saved to the database. Thanks poirier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 15:08:07 +00:00
Timo Graham e41e3a543e Fixed #16940 - Added "Generic relations" to docs index; thanks danielr for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 11:38:40 +00:00
Timo Graham b4dcbe398d Fixed #17196 - Typo in docs/ref/contrib/staticfiles.txt; thanks caa for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 10:57:59 +00:00
Timo Graham c29e089000 Fixed #17105 - Typos in docs/ref/contrib/csrf.txt; thanks googol for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-19 10:53:26 +00:00
Jannis Leidel 6f66b55108 Fixed #17255 -- Removed "as" prefix from new timezone template filter names for the sake of clarity. Cheers to Aymeric Augustin for bearing with me.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 15:00:08 +00:00
Aymeric Augustin 9b1cb755a2 Added support for time zones. Thanks Luke Plant for the review. Fixed #2626.
For more information on this project, see this thread:
http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 13:01:06 +00:00
Aymeric Augustin 01f70349c9 Fixed #17248 -- Added a missing versionadded directive for TestCase.assertRaisesMessage.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 07:09:18 +00:00
Carl Meyer 5e53f12761 Updated committer bio.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 01:36:57 +00:00
Luke Plant 543984f462 Fixed some ReST errors in 'regroup' template tag docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-17 22:00:08 +00:00
Jannis Leidel c20d33201c Fixed #17223 -- Correctly reference the signed cookies session backend. Thanks, Bryan Veloso.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-17 21:16:42 +00:00
Aymeric Augustin 1adf8d4386 Fixed #17240 -- Replaced links to the online version of the docs by internal references.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-16 21:04:28 +00:00
Karen Tracey fae75a32ee Fix #17174: Add note in the supported databases notes that MySQL can't conceive of a time unit smaller than a second. Thanks jammon and poirier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-13 19:28:43 +00:00
Karen Tracey ba0734af9c Fix #17119: Update cache doc to match current implementation, which does (since r15705) cache pages with GET parameters. Thanks Vanni, poirier, and calvinspealman.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 20:30:03 +00:00
Karen Tracey efe4e2e517 Fix #16570: Restore ability to have decimal fields where max_digits equals decimal_places. Thanks dcwatson and kenth.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 19:53:56 +00:00
Luke Plant eb81f979a8 Fixed typo in 1.4 release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 18:50:50 +00:00
Karen Tracey 3fa49c4e6e Fix #17179: Document that yesno filter's default argument is "yes,no,maybe". Thanks CarlFK and calvinspealman.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 18:47:51 +00:00
Karen Tracey 0426962dac Fix #16998: Update name of the CSRF middleware in doc. Thanks ptone and poirier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 17:37:29 +00:00
Julien Phalip 1aef1b20aa Fixed #17205 -- Fixed a small typo in the urls doc. Thanks, rabio.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 13:39:42 +00:00
Julien Phalip 726f082aa9 Fixed #17206 -- Fixed an outdated error message in the tutorial part 3. Thanks, rabio.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17082 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-12 13:30:05 +00:00
Julien Phalip c3df840c20 Fixed #16903 -- Added `--no-location` option to the `makemessages` command to not write '#: filename:line' comment lines in language files. Thanks to alpar for the suggestion and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-11 13:07:14 +00:00
Aymeric Augustin 64fdd84474 Fixed #17184 -- Typo in models documentation. Thanks elimisteve for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-10 08:41:21 +00:00
Carl Meyer 7f658a5429 Refs #17171 -- Updated tutorial sections 3 and 4 to follow the startproject template and consistently use url() function in URLconf. Thanks haimunt for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-06 16:58:04 +00:00