Commit Graph

10573 Commits

Author SHA1 Message Date
Andrew Godwin 838a16ec20 Backed out [16356] due to later rejection of #16182.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-17 09:47:08 +00:00
Andrew Godwin 222a5ed69e Reverting [16376] in preparation for reverting [16356]. See #16182.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-17 09:47:01 +00:00
Jannis Leidel fffe983da1 Corrected slightly odd wording added in r16420.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-17 07:39:03 +00:00
Ramiro Morales b870bf6b9a Fixed #16255 -- Raised minimum PostgreSQL version supported to 8.2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 20:05:25 +00:00
Ramiro Morales b2f5efc6ac Fixed #8999 -- Removed useless code in handling of `exclude` option in ModelAdmin and InlineModelAdmin custom form(set) hooks. Thanks goes to seanl for the report, patch and bkonkle and Julien for further work on final patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 19:56:22 +00:00
Jannis Leidel b4cdf4d111 Fixed #10802 -- Handle ImportErrors and AttributeErrors gracefully when raised by the URL resolver system during startup. Many thanks, IonelMaries and Bas Peschier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:41:14 +00:00
Jannis Leidel 30e842632e Fixed #9588 -- Allow passing kwargs to `GenericInlineModelAdmin.get_formset` just like the InlineModelAdmin. Thanks, prestontimmons.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:35:04 +00:00
Jannis Leidel 97f22f2969 Fixed #12375 -- Added a dict() method to convert a MultiValueDict (such as a QueryDict) to a dictionary of key-value pairs. Thanks, oinopion and hvdklauw.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:55 +00:00
Jannis Leidel dfa29161e2 Fixed #14020 -- Made the `HttpResponse` class slightly more behave like a dictionary, allowing the alternative argument to be unset. Serious thanks to schmichael and moopet.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:46 +00:00
Jannis Leidel 22529d41b2 Fixed #15127 -- Properly copy the choices of choice fields. Thanks, dready and Julian Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:38 +00:00
Jannis Leidel aa40dc6252 Stopped the admin JavaScript code from completely removing the `jQuery` object from the global namespace to ease the use of jQuery plugins. The `django.jQuery` object is still supposed to be used by Django's own JavaScript files. Refs #12882.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:28 +00:00
Jannis Leidel 44b03484ec Fixed #15908 -- Mention blocktrans in the pluralize filter documentation section. Thanks, Julien Phalip.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:20 +00:00
Jannis Leidel aad6f21b29 Fixed #16057 -- Extended deployment documentation with instructions for uWSGI. Thanks, jpic and aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:12 +00:00
Jannis Leidel 439cbeaa68 Fixed #16031 -- Corrected comments template examples. Thanks, teraom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:34:02 +00:00
Jannis Leidel c80914d0d1 Fixed #16221 -- Corrected doc string example in comments permalink template tag. Thanks, Thejaswi Puthraya.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:33:54 +00:00
Jannis Leidel a1991e37f4 Fixed #16200 -- Stopped TemplateIfParser from returning something in `__init__`. Thanks, traff.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 16:33:47 +00:00
Jannis Leidel 662b372d02 Fixed #16264 -- Improved form widget documentation. Many thanks to Bas Peschier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 15:27:19 +00:00
Jannis Leidel e008fde23e Fixed #16273 -- Fixed typo in staticfiles docs. Thanks, BernhardEssl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-16 15:27:11 +00:00
Russell Keith-Magee 28e5341bf4 Fixed #16275 -- Added __future__ import to support with statement. Thanks to Jonas Obrist for the report
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-15 23:52:44 +00:00
Jannis Leidel 896e3c69c7 Fixed #11585 -- Added ability to translate and prefix URL patterns with a language code as an alternative method for language discovery. Many thanks to Orne Brocaar for his initial work and Carl Meyer for feedback.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-15 17:29:10 +00:00
Jannis Leidel 62bb4b8c37 Added a few cross references to the i18n docs and documented pgettext and colleagues.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-15 10:48:13 +00:00
Luke Plant 4047a21fa8 Noted new security overview page in the 1.4 release notes
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 23:37:12 +00:00
Luke Plant 06a2515145 Fixed typo in release notes regarding CSRF with PUT/DELETE etc
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 23:31:45 +00:00
Jannis Leidel 3f37d1673b Fixed #16183 -- Fixed an ignored auth test. Thanks, desh.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 10:45:49 +00:00
Jannis Leidel 3d970762af Fixed naming of test methods for the sake of consistency.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 10:35:13 +00:00
Jannis Leidel b5e7eab9fd Fixed #16236 -- Added get_form_kwargs method to WizardView as a way to easily provide kwargs to each step form.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 10:35:02 +00:00
Jannis Leidel 3ee076b135 Fixed #16248 -- Corrected a few typos in the security docs. Thanks, buddelkiste.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 10:34:52 +00:00
Jannis Leidel 5180e733fa Fixed #16239 -- Removed stale entry in django.test.simple.__all__. Thanks, melinath.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-14 09:30:52 +00:00
Jannis Leidel 823bac36db Fixed #16246 -- Fixed GenericIPAddressField tests on PostgreSQL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-13 20:15:13 +00:00
Jannis Leidel 479f2bce3c Removed duplicate entry in introspection PostgreSQL db backend.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-13 20:15:04 +00:00
Jannis Leidel bead688a3b Shortened some test model names that were introduced in r16366 to fix running tests on PostgreSQL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-13 17:48:02 +00:00
Ramiro Morales bcad22655f Removed a name clash in a test method. Refs #16246.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-13 17:38:17 +00:00
Russell Keith-Magee c013c07ed7 Fixed #16243 -- Corrected test suite failure in model_forms when PIL isn't installed
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-13 13:23:49 +00:00
Karen Tracey 13efd10465 Refs #16234: Avoid GenericIPAddressField clobbering Field default_error_messages dict.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-13 04:31:56 +00:00
Ramiro Morales 7116c31373 Fixed incompatibility (`with` statement usage) with Python 2.5 introduced in [16368]. Thanks ojii for the report via IRC.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 23:50:37 +00:00
Ramiro Morales 5112acbf8f Fixed incompatibility (usage of class decorator) with Python 2.5 introduced in [16386]. Thanks ojii for the report via IRC.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 23:22:34 +00:00
Jannis Leidel 14bac2b97d Fixed broken test introduced in r16385.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 16:57:09 +00:00
Ramiro Morales 84c71148e3 Fixed #7836 -- Modified strategy used by the test client to check for session functionality so it is useful in environments where the DB-based session backend isn't being used. Thanks trevor for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 16:33:40 +00:00
Jannis Leidel 050e11956f Fixed #15856 -- Added Macedonian localflavor. Many thanks to vasiliyeah.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 13:31:40 +00:00
Jannis Leidel 9f3d76a921 Fixed docs render warning.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 13:05:02 +00:00
Jannis Leidel f749bb829c Fixed #12875 -- Added get_ordering to ModelAdmin. Many thanks to Manuel Saelices.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 13:04:53 +00:00
Ramiro Morales f0adae4c6e Fixed #12658 -- Fixed test discovery so ImportErrors aren't ignored when both `tests` and `models` are packages. Thanks schinckel for the report and boxm for a patch for the issue.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 12:34:10 +00:00
Timo Graham 0686b0662a Fixed #15764 - Corrected mixin docs for DeleteView?; thanks linovia for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-12 00:28:11 +00:00
Timo Graham 4207fed932 Fixed #15949 - Clarified the docs for password_reset_done view; thanks cyclops for the suggestion; Horst Gutmann for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 23:40:59 +00:00
Jannis Leidel a0791b2759 Fixed #16224 -- Fixed override_settings test utility to correctly work with TestCase classes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 20:40:02 +00:00
Andrew Godwin e096d56406 Fixed #16222: Test failures due to more precise cookie timings. Refs [16356].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 19:27:32 +00:00
Ramiro Morales 55005a5181 Added file forgotten in r16369.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 18:48:09 +00:00
Jannis Leidel 0ebaf10258 Fixed #11989 -- Allow passing a Template instance to inclusion_tag. Thanks to Jeremy Dunck and tcoenen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 16:22:45 +00:00
Jannis Leidel d27f909d2e Fixed #12847 -- Added name parameter to simple_tag, assignment_tag and inclusion_tag helpers. Thanks, vladmos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 16:05:28 +00:00
Jannis Leidel 4970ef07c2 Fixed #9189 -- Added not about urlize only covering .com, .net, and .org domains. Thanks, dArignac.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-11 15:45:14 +00:00