Commit Graph

10358 Commits

Author SHA1 Message Date
Jannis Leidel 578a31fea3 Fixed #15921 -- Refined naturaltime filter added in r16071 to use timesince and timeuntil filters as fallbacks instead of date filter.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-17 10:16:12 +00:00
Jannis Leidel 9ad005ec1c Updated humanize tests to use the FixedOffset timezone from the utils and removed a bit code smell while I'm here.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-17 10:15:58 +00:00
Luke Plant 66fd824ee0 Fixed djangodocs Sphinx extension to work with latest Sphinx
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-15 23:02:36 +00:00
Timo Graham ce6072aa96 Fixed #15769 - Documented FormWizard's initial argument; thanks aimaz for the suggestion; jrothenbuhler for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-15 19:11:57 +00:00
Ramiro Morales 07bfc76ecf Fixed #15790 -- Fixed QuerySet only() and defer() methods behavior with proxy models. Thanks Michal Modzelewzki for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-15 00:56:01 +00:00
Adrian Holovaty c5cb2fabd2 Edited docs/releases/1.4.txt changes from [16124]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-14 17:58:32 +00:00
Adrian Holovaty c2ba96d8a9 Tweaked weird wording of docs/ref/contrib/humanize.txt 'naturaltime' section from [16071]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-14 17:44:10 +00:00
Ramiro Morales 2b5730873b Added ability to describe grouping of form fields in the same row to the `fields` ModelAdmin attribute.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-14 16:29:39 +00:00
Ramiro Morales 5f605678f0 Removed last vestiges of references to technical messages from documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-14 12:28:36 +00:00
Luke Plant e127e17b49 Fixed our Sphinx extension to work with latest Sphinx
This is pretty hacky, but there doesn't seem to be a nice way to fix it,
since we can't call the base method - we are deliberately overriding it in
order to not call the base method, which adds an unwanted 'border=1' to the
HTML.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-14 02:58:58 +00:00
Ramiro Morales 1d7fa75c97 Fixed #15064 -- Made manage.py honor the existence and value of DJANGO_SETTINGS_MODULE env var. Thanks olau for the report and Shawn Milochik for a patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-13 12:15:52 +00:00
Simon Meers 5ecb88c146 Fixed #16014 -- numerous documentation typos -- thanks psmith.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-13 04:33:42 +00:00
Simon Meers df6e031408 Fixed #16005 -- Error in blocktrans docs -- thanks bezidejni
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-13 00:48:30 +00:00
Jannis Leidel ae3fec0da8 Fixed minor typo in tests introduced in r16121. Refs #5925.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-12 13:24:07 +00:00
Luke Plant 71a7466dd6 Fixed #16009 - typo in CSRF_FAILRE_TEMPLATE.
Thanks to adehnert for report and patch.

Though I flail to see what problem it was causing...

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-12 03:03:16 +00:00
Chris Beaven 4d26f6512c Fixes #15595 -- emphasize the benefits of django.test.TestCase. Thanks for the patch Shawn Milochik
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-11 21:29:14 +00:00
Luke Plant 73721912e2 Fixed #16002 - test failure due to missing `from __future__ import with_statement`
Thanks to julien for the report

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-11 08:58:58 +00:00
Adrian Holovaty 6e9067623b Fixed small typo from [16054] in docs/topics/http/urls.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 20:16:39 +00:00
Jannis Leidel 5e39ada245 Added missing callables to django.utils.translation.__all__ (`override` and `ugettext_noop`). Many thanks to Ramiro for the hint.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 18:49:04 +00:00
Luke Plant 724c84fe90 Fixed #13648 - '%s' escaping support for sqlite3 regression.
Thanks to master for the report and initial patch, and salgado and others
for work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 12:20:47 +00:00
Chris Beaven 014cc896bc Fixes #15963 -- Misleading FileField.save documentation. Thanks for the report and patch, ejucovy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 00:26:32 +00:00
Chris Beaven 39517438e0 Fixes #15588 -- 1.3 release documentation for FileField no longer deleting files unclear. Thanks for the patch, Philip Neustrom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10 00:19:02 +00:00
Luke Plant 396bc58889 Updated AJAX example code in CSRF docs to be consistent regarding what are safe HTTP methods
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:46:02 +00:00
Luke Plant cb060f0f34 Fixed #15258 - Ajax CSRF protection doesn't apply to PUT or DELETE requests
Thanks to brodie for the report, and further input from tow21

This is a potentially backwards incompatible change - if you were doing
PUT/DELETE requests and relying on the lack of protection, you will need to
update your code, as noted in the releaste notes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:45:54 +00:00
Luke Plant 8cbcf1d3a6 Fixed #14134 - ability to set cookie 'path' and 'secure' attributes of CSRF cookie
Thanks to cfattarsi for the report and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:00:22 +00:00
Luke Plant a75120927e Added 'settings' section to CSRF docs, eliminating the unneeded 'Subdomains' section
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:00:10 +00:00
Luke Plant d3641d889b Clarified wording about use of 2 decorators in CSRF docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:00:02 +00:00
Luke Plant bf7af2be15 Added clarifying note to docs for CSRF_COOKIE_DOMAIN
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 22:59:52 +00:00
Simon Meers 8122ce7c76 Fixed #15989 -- typo in static-files howto. Thanks luizvital.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 22:30:31 +00:00
Luke Plant b6c5f8060d Fixed #15354 - provide method to ensure CSRF token is always available for AJAX requests
Thanks to sayane for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 21:35:24 +00:00
Luke Plant e9342e9b32 Fixed #15469 - CSRF token is inserted on GET requests
Thanks to goran for report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 19:06:57 +00:00
Luke Plant 7c648ea4aa Mentioned simplification of AJAX example code in CSRF docs.
Refs #15469. Thanks to aaugustin for the suggestion

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 19:06:49 +00:00
Luke Plant 5df93d529d Documented the edge case of needing a view that is partly CSRF protected
Refs #15518.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:52 +00:00
Luke Plant b5da093fa9 In CSRF docs, moved 'Exceptions' section to 'Edge cases', and cleaned up some associated markup
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:45 +00:00
Luke Plant eadcbcb131 Fixed #15518 - documented requires_csrf_token
Thanks to vzima for a report that raised the issue.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:36 +00:00
Luke Plant 1d350a6c51 Changed an example in CSRF docs to use new 'render' shortcut
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 18:27:28 +00:00
Luke Plant ae1866ddef Fixed #15869 - example AJAX code in CSRF docs fails sometimes for IE7 or absolute same origin URLs
Thanks to nick for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 15:40:01 +00:00
Chris Beaven 161b94ef7b Fixes #15778 -- createsuperuser fails on international characters in system user names. Thanks for the patch, Hynek Cernoch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 01:10:40 +00:00
Jannis Leidel 688abe3b8d Fixed #15981 -- Use ungettext instead of manually checking for plurals. Thanks, gasperzejn.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 19:55:51 +00:00
Luke Plant 385ae343fb Fixed #15709 - Duplicated group_by condition
Thanks to ziangsong for report, and to mk for the patch

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 19:02:51 +00:00
Jannis Leidel 32bd953e63 Minor renaming for consistency.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 17:05:06 +00:00
Jannis Leidel 2abd7af4dd Fixed #11212 -- Stopped using quoted-printable encoding for mails with non-ASCII characters but rely on 8bit encoding instead. Thanks, phr, gisle and Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:59:33 +00:00
Jannis Leidel fe96214939 Fixed #13154 -- Fixed the URL resolver's reverse() to match the behavior of its resolve() with regard to the default kwargs. Many thanks to patrys.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:59:25 +00:00
Jannis Leidel eb24b54634 Fixed #15496 -- Corrected handling of base64 file upload encoding. Thanks, gene and Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:59:16 +00:00
Jannis Leidel 02b837d38a Fixed #8527 -- Made CAPostalCodeField more forgiving of the input format. Thanks to Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:59:08 +00:00
Jannis Leidel c5f58f54fd Fixed #15941 -- Fixed DateField docs to no longer state that the admin calendar's week always starts on Sunday (refs FIRST_DAY_OF_WEEK setting). Thanks aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:58 +00:00
Jannis Leidel e282e1b327 Added missing reference to custom template tag docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:52 +00:00
Jannis Leidel 0322f2b653 Fixed #15263 -- Added support for format localization to the now template tag. Thanks to danielr and dmclain.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:45 +00:00
Jannis Leidel 032b4ab5df Fixed #15971 -- Fixed regression introduced in r16144 that prevented the use of the field's verbose_name attribute. Thanks to mk and Julien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 16:58:35 +00:00
Luke Plant 4d039d8d05 Fixed #15980 - Unknown encoding "utf8" in tests/regressiontests/views/__init__.py
Thanks to davidbarnett2 for the report

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-07 10:47:11 +00:00