Commit Graph

11534 Commits

Author SHA1 Message Date
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 20dbbcc264 Small fix to comments in utils/html.py from [17347]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 17:57:15 +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
Adrian Holovaty 086697b231 Fixed loader_tags.py to import token_kwargs from the correct module
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-02 17:03:32 +00:00
Paul McMillan 1030d66a14 Fixed #17481. pbkdf2 hashes no longer ommit leading zeros.
Some existing user passwords may need to be reset or converted 
after this change. See the 1.4-beta release notes for more details.

Thanks bhuztez for the report and initial patch, claudep for the test.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-02 04:44:17 +00:00
Aymeric Augustin ccbadbc5c2 Improved the fix of r17416 so it actually works on all platforms. Refs #17469.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-01 21:36:18 +00:00
Aymeric Augustin dcbd5eefd6 Fixed #17469 -- Prevented a double URL-to-filesystem path translation in the media handler of LiveServerTestCase, which led to infinite redirection loops under Windows and test failures.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-01 20:08:10 +00:00
Carl Meyer d8e75f6c6f Fixed #17622 - Added Justin Myles Holmes to AUTHORS.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-01 04:25:30 +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
Aymeric Augustin c82f1dcf95 Skipped the test introduced at r17403 on Python 2.5, because it requires warnings.catch_warnings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-31 19:47:40 +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 d9061c01a9 Fixed #5964 -- Added unicode-aware versions of urlunquote and urlunquote_plus.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-29 09:00:12 +00:00
Aymeric Augustin 7ad7a8d2d3 Added basic tests for databrowse. Refs #5968.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-28 20:58:22 +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
Aymeric Augustin 4a3aceed3f Added __future__ import for Python 2.5 forgotten in r17402.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-28 20:37:05 +00:00
Aymeric Augustin 58bcb7d161 Caught (and tested) the warning added at r17393 in the corresponding test. Refs #17580.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-28 20:34:02 +00:00
Aymeric Augustin 6b16580aaa Fixed #12972 -- Validated that flatpages URLs start and (when appropriate) end with a slash. Thanks jabapyth, claudep and kmtracey.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-28 20:27:23 +00:00
Aymeric Augustin f9ea619613 Fixed #12099 -- Prevented admindocs from crashing when an application that provides template tags libraries is packaged as an egg. These libraries will be ignored.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-28 18:18:01 +00:00
Adrian Holovaty d6d4d60109 Made a tiny performance improvement in the template system's Parser.parse() -- don't look up the global variables TOKEN_TEXT, etc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-28 01:50:14 +00:00
Adrian Holovaty 234b7e3720 Made a small optimization to the template lexer. There's no need to calculate the len of VARIABLE_TAG_START, et al, each time we create a token.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-27 23:46:22 +00:00
Aymeric Augustin 1d54e3a956 Fixed #15828 -- Removed explicit implementation of empty setUp / tearDown methods. Backport of http://hg.python.org/unittest2/rev/3d33f92496fa.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-27 22:25:44 +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
Jannis Leidel 0907233040 Added a missing warning forgotten in r17392.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-24 10:32:28 +00:00
Jannis Leidel 8f168976d6 Fixed #17580 -- Made sure datetime.date instances are correctly handled when being passed to a DateTimeField fields and the timezone support is enabled by making it aware using the default timezone.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-24 10:00:39 +00:00
Julien Phalip 6ae393d74d Fixed #15092 -- Made `{% now %}` work with single-quoted string arguments. Thanks to ninja_otoko for the report and to steveire, Aymeric Augustin and Claude Paroz for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-24 08:02:34 +00:00
Julien Phalip 804bd40383 Fixed #17506 -- Did a minor optimization in the sessions' database backend. Thanks to FunkyBob for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-24 07:42:38 +00:00
Ramiro Morales 752a43e245 Reverted [17378] until a public API is available for application labels.
This will allow to solve the i18n of such labels in a more holistic way
without the need to introduce temporary, undocumented mechanisms to
translate them.

Refs #3591, #10436

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-23 16:17:47 +00:00
Aymeric Augustin 7beb0db79b Fixed #10320 -- Made it possible to use executemany with iterators. Thanks MockSoul for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-22 16:41:20 +00:00
Aymeric Augustin 4d030e540d Fixed the link to the IRC logs in the README. Refs #17453, #16277.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-21 15:45:54 +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
Aymeric Augustin 905e33f84a Fixed #16885 -- Confirmed features of mirror databases when setting up test databases.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-20 23:15:22 +00:00
Alex Gaynor 477f4d8061 Clean up the form's code a little bit, to make it more consistantly go through one code path. Patch from Travis Swicegood.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-19 22:05:47 +00:00
Jacob Kaplan-Moss e8e4293a48 Fixed #17078: properly invoke IPython 0.12.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-19 17:38:56 +00:00
Ramiro Morales 203c4fef4d Fixed translatability of application names in admin app.
Also, made usage of the `filter` template tag consistent in some
breadcrumbs elements across the different admin templates.

Fixes #10436.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-19 11:23:31 +00:00
Jannis Leidel aef0283f89 Fixed #17468 -- Made sure the project/app template management command tests correctly handle an existing directory on Windows.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-15 16:06:56 +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