Commit Graph

10643 Commits

Author SHA1 Message Date
Luke Plant 45e55b9143 Fixed #14614 - filtering of sensitive information in 500 error reports.
This adds a flexible mechanism for filtering what request/traceback
information is shown in 500 error emails and logs. It also applies
screening to some views known to be sensitive e.g. views that handle
passwords.

Thanks to oaylanc for the report and many thanks to Julien Phalip for the
patch and the rest of the work on this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-08 22:18:46 +00:00
Luke Plant bb12a02bd8 Deprecated legacy ways of calling cache_page
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-08 11:12:01 +00:00
Alex Gaynor b67ff14208 Removed an alias for ``django.template.loader`` that had been deprecated since 2005. This should only affect World Online.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-07 21:17:41 +00:00
Alex Gaynor 7a600166a7 Name this test method correctly. Refs [16334].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-07 20:59:07 +00:00
Alex Gaynor fcf8312ade Made clear() on a reverse foreign key significantly more efficient. Thanks to Andrew Godwin for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-07 20:51:59 +00:00
Carl Meyer 684b0396cf Fixed #14082 -- Use metaclass of provided ModelForm subclass in modelform_factory. Thanks jspiros and Stephen Burrows for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-07 16:15:54 +00:00
Jannis Leidel 64e19ffb4e Fixed #7704, #14045 and #15495 -- Introduce a lexer for Javascript to fix multiple problems of the translation of Javascript files with xgettext. Many thanks to Ned Batchelder for his contribution of the JsLex library.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-07 16:11:25 +00:00
Luke Plant d14eb13992 Removed an unnecessary import
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-06 12:11:48 +00:00
Ramiro Morales 0638ba5bba Enhanced a bit the documentation and docstring for the url template tag. Also, added a test for it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-05 23:44:34 +00:00
Luke Plant 0b7fc04691 Reverted most of [16051], because it was thoroughly incorrect (whatever some validator says)
Refs #16154

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-04 21:51:13 +00:00
Timo Graham fc508fd5d2 Fixed #15990 - Simplified a sentence regarding form validation for ModelForms; thanks jblaine for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-04 21:42:53 +00:00
Karen Tracey 070151293d Undo part of r16051 to avoid dataloss bug. Refs #16154.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-04 17:05:38 +00:00
Karen Tracey acbb911ad5 Fix #15880: Prevent "stalling" when running dev server in background by ignoring SIGTTOU for the duration of tcsetattr.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-04 15:29:11 +00:00
Timo Graham 773e1717c0 Fixed #16145 - typo in manager docs; thanks leereilly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-04 14:38:45 +00:00
Luke Plant d41a25ebc6 Fixed import error that was causing EggLoader tests not to be run
Also improved ImportError handling that was causing this fact to be missed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-04 14:32:55 +00:00
Luke Plant 39005c2b84 Fixed visual bug with sorted column headers in changelist having dark band at top in some cases.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-03 13:43:23 +00:00
Luke Plant 832ca058fe Internet Explorer fixes for admin sorting UI
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-03 11:54:47 +00:00
Luke Plant 74b1616290 Improved UI for advanced sorting controls.
Now allows individual fields to be removed/toggled.

Refs #11868

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-03 11:54:39 +00:00
Luke Plant cb996cce05 Fixed various bugs related to having multiple columns in admin list_display with the same sort field
Thanks to julien for the report

Refs #11868

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-03 11:54:29 +00:00
Luke Plant 22598d0044 Improved cog icon for sorting interface in admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-02 19:50:48 +00:00
Luke Plant 16ee372354 Fixed position of new cog icon in admin changelist relative to text
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-02 16:42:19 +00:00
Luke Plant 5434ce231d Fixed #11868 - Multiple sort in admin changelist.
Many thanks to bendavis78 for the initial patch, and for input from others.

Also fixed #7309. If people were relying on the undocumented default ordering
applied by the admin before, they will need to add 'ordering = ["-pk"]' to
their ModelAdmin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-02 16:18:47 +00:00
Luke Plant 78b37975c9 Fixed #16144 - layout of admin changelist broken for RTL languages.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-02 12:19:32 +00:00
Luke Plant 65cc646c48 Removed a broken test added in [16312]
This test caused a test failure (in subclass CustomModelAdminTest), and the
test also proved to be extremely brittle when trying to implement #11868,
and basically unfixable with current infrastructure.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-02 00:24:37 +00:00
Luke Plant 2304ca4236 Fixed bug with `__str__` headers in admin changelist have a non-functioning sort URL
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 23:17:40 +00:00
Ramiro Morales 2367089392 Tweaked test added in [16308] so it doesn't fail.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 22:09:50 +00:00
Alex Gaynor 06279e454a Fix the staticfiles_tests and django.conf to not think that None meant a lazy object hadn't been evaluated. Thanks to Jannis for informing me that I broke the test suite (if you were harmed by this I'll buy you a cookie). Sorry.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 20:45:47 +00:00
Jannis Leidel 9abe734b83 Fixed #16141 -- Fixed typos in new form wizard.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 20:14:25 +00:00
Alex Gaynor 60cf3f2f84 Allow SimpleLazyObjects to return None without constantly being reevaluated, also proxy ``__nonzero__``, and do some codecleanup as well.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 15:30:06 +00:00
Jannis Leidel 632dfa2338 Fixed #9200 -- Added new form wizard to formtools based on class based views. Many thanks to Stephan Jäkel, ddurham and ElliottM for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 13:47:00 +00:00
Luke Plant 1a951fa8d4 Added info to release notes about CSRF improvements
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-31 21:29:35 +00:00
Alex Gaynor 1cfb00dc41 Cleaned up how ``request.user`` is set, this is a follow up to [16297]. Thanks for the review Luke.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-31 15:43:19 +00:00
Luke Plant 4531767700 Fixed auth context processor tests, which were not running at all previously.
It seems they were accidentally disabled following being moved from
regressiontests in [15990]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-31 15:19:19 +00:00
Luke Plant 93e9d91501 Fixed #15805 - assertFieldOutput should not use assertRaisesRegexp
Thanks to julien for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-31 14:02:22 +00:00
Timo Graham caefdc8246 Fixed #16090, #16091, #16114 - Typos in docs; thanks teraom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-31 09:42:19 +00:00
Luke Plant 0994416d3f Fixed some typos/grammar in clickjacking docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-30 22:50:11 +00:00
Luke Plant 524c5fa07a Fixed #14261 - Added clickjacking protection (X-Frame-Options header)
Many thanks to rniemeyer for the patch!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-30 22:27:47 +00:00
Luke Plant dc4c2f3add Fixed #15929 - test.client.RequestFactory keeps state/AuthMiddleware does monkey patching
Thanks to m.vantellingen for the report and tests, and to aaugustin for
work on the tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-30 16:33:23 +00:00
Luke Plant de3b58d626 Fixed #15776 - delete regression in Django 1.3 involving nullable foreign keys
Many thanks to aaron.l.madison for the detailed report and to emulbreh for
the fix.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-30 16:04:25 +00:00
Timo Graham 8ad3c41c69 Fixed #16093 - Typo in "Performing raw SQL queries"; thanks direvus.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-30 12:11:10 +00:00
Ramiro Morales f7b251be33 Fixed #11436 -- Updated bundled copy of doctests.py to the one shipped with Python 2.5, preserved local tweaks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-29 23:26:44 +00:00
Jannis Leidel 49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-29 17:41:04 +00:00
Jannis Leidel 61da3cc47a Fixed #16120 -- Updated a few reference links in the docs after the contributing reorganization. Thanks to Julien and Ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-29 12:47:30 +00:00
Jannis Leidel 8f4d394c74 Fixed #14903 -- Removed much of the code in django.core.servers.basehttp that was previously copy-pasted from the wsgiref module which was added to Python 2.5. Many thanks to maxbublis and aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-28 21:28:52 +00:00
Jannis Leidel d34bb3c833 Fixed #16108 -- Fixed another race condition in the FileSystemStorage backend with regard to deleting a file. Refs #16082, too. Thanks, Aymeric Augustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-28 13:06:08 +00:00
Ramiro Morales afca4e9349 Tweaked some changes from [16283] to fix failures in i18n and defaultfilters regression tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-27 17:05:16 +00:00
Ramiro Morales d0716044dd Changed a bit the strategy used to test staticfiles finders so they can cope with even more differences in case of paths under Windows. Refs #14961
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-27 10:55:07 +00:00
Jannis Leidel 407f62fd31 Fixed #15796 -- Restructured the contributing documentation and added note about newly added Trac abilities. Many thanks to Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-27 10:49:47 +00:00
Alex Gaynor 69cfee2f16 Moved a bunch of imports in the defaultfilters library out of functions. On CPython this is actually a big performance win if one of these filters is your bottleneck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-27 04:22:37 +00:00
Alex Gaynor 20fbfbadcd Explicitly close a file in the static serve view. Thanks to Benjamin Peterson for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-27 04:06:23 +00:00