mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Code Issues 27 Releases Wiki Activity
10,942 Commits 28 Branches 426 Tags 667 MiB
6d6fe61bf6
Commit Graph

10942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Bronn
e5aeba018f Updated geoadmin tests to reflect that OSM js is no longer required as of r16847. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 22:28:17 +00:00
Paul McMillan
d15ef4532e Removed an unused function definition. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 21:33:14 +00:00
Julien Phalip
436aeb6e15 Fixed #16676 -- Corrected the behavior of the 'add' template filter to return an empty string instead of the given value unchanged in the case of an invalid use. Thanks to dtrebbien for the report and to Aymeric Augustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 08:33:39 +00:00
Julien Phalip
357910c1c6 Rectified the settings reference documentation to indicate that USE_L10N (and not USE_I18N) controls the activation of locale-dictated formats. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 07:50:50 +00:00
Julien Phalip
9316671eff Fixed #13211 -- Added the Group API reference and a Permission API example to the contrib.auth documentation. Thanks to b14ck for the report and to jpaulett and CrazyGir for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 07:24:16 +00:00
Chris Beaven
e63fa0ff83 Fixes #8103 -- Select widget should only allow for one selected option 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-18 04:09:44 +00:00
Justin Bronn
1ec25c4fb7 OpenLayers has had built-in OSM support since 2.10, no need for extra JS. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-17 23:01:46 +00:00
Justin Bronn
30745b2e65 Updated the geographic admin to use OpenLayers 2.11. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-17 20:06:00 +00:00
Justin Bronn
3ac877840a Fixed #15277 -- Cleaned up ogrinspect command, added tests and extended support beyond file-based OGR data sources. Thanks, willinoed for bug report and jpaulett for initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-17 19:54:52 +00:00
Justin Bronn
f97a574196 Fixed #16864 -- WKT regex now allows negative SRIDs. Thanks, Marcel Dancak for bug report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 21:19:30 +00:00
Carl Meyer
00678334aa Fixed #16863 -- Corrected ReST markup to avoid errors building docs. 
Although directives such as "note" and "warning" will accept content
immediately following the directive, this is technically where arguments to the
directive should go (see http://sphinx.pocoo.org/rest.html#directives). Putting
the content there means that any lines beginning with an inline text role
(e.g. ":setting:`DEBUG`") will be mis-interpreted as an option block for the
directive. To avoid this error, there should always be a blank line between the
directive start and the directive content.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 18:06:42 +00:00
Carl Meyer
d1d6109229 Added release note and updated TEMPLATE_DEBUG documentation for r16833. Thanks jezdez for the reminder. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 17:07:19 +00:00
Carl Meyer
343004c4de Fixed #16568 -- Added RequireDebugFalse filter to prevent sending 500 error emails when DEBUG is True in projects with no explicit LOGGING setting. Thanks to Andreas Pelme for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 16:41:38 +00:00
Carl Meyer
f9dad46d36 Fixed #16803 -- Use model verbose_name directly as ContentType unicode representation so it can be translated. Thanks to bronger for the report and Ivan Sagalaev for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 11:57:03 +00:00
Carl Meyer
568681c6da Fixed #16812 -- Percent-encode URLs in verify_exists, to fix test failures on Python 2.5 and 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 11:12:35 +00:00
Carl Meyer
e5090a3b2a Fixed #16094 -- Added missing colon in custom permissions docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 10:53:15 +00:00
Julien Phalip
def775ae5e Reverted the change in r16683, which, while fixing an alignment issue in IE7 with the admin's "Save and continue editing" and "Save and add another" buttons, caused the swapping of those buttons' order. Thanks to jocmeh for the report. Refs #16852. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 06:30:05 +00:00
Carl Meyer
4397c587a4 Fixed #16770 -- Eliminated TemplateSyntaxError wrapping of exceptions. Thanks to Justin Myles-Holmes for report and draft patch. 
Exceptions raised in templates were previously wrapped in TemplateSyntaxError
(in TEMPLATE_DEBUG mode only) in order to provide template source details on
the debug 500 page. The same debug information is now provided by annotating
exceptions rather than wrapping them. This makes catching exceptions raised
from templates more sane, as it's consistent in or out of DEBUG, and you can
catch the specific exception(s) you care about rather than having to also catch
TemplateSyntaxError and unwrap it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 01:16:25 +00:00
Alex Gaynor
608548baa2 Fixed #16854 -- corrected an AttributeError coming from the contenttypes post-syncdb hook. Thanks to desh for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-15 23:55:30 +00:00
Carl Meyer
ce48e8e940 Fixed #16848 - Adjusted SimpleTemplateResponse.__init__ to be less brittle. 
Could have reverted r16830 instead, but HttpResponse shouldn't have to dance
around and do non-obvious things to keep TemplateResponse happy,
TemplateResponse should be robust against the possibility that
HttpResponse.__init__ might set self.content.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-15 07:26:35 +00:00
Paul McMillan
2fa433ed55 Slight cleanup to r16829, thanks Alex Gaynor for the note. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-14 23:58:12 +00:00
Paul McMillan
50255e3305 Fixed #16494 by normalizing HttpResponse behavior with non-string input. HttpResponse now always converts content to string on output, regardless of input type. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-14 23:27:35 +00:00
Justin Bronn
67e05fcd39 Fixed #16778 -- Improved escaping of geometries on PostgreSQL, allowing GeoDjango to work on 9.1. Thanks, piro for ticket and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-13 20:43:33 +00:00
Justin Bronn
dd292b948e Updated versions and added libproj-dev to the GeoDjango installation docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-13 20:30:24 +00:00
Jannis Leidel
f3ae496201 Fixed #16833 -- Removed undocumented mixin parameter from the Storage.open() method as this was an undocumented and obscure feature. Thanks to Marty and Russell for sanity-checking. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-13 15:10:49 +00:00
Julien Phalip
3513234cf8 Fixed #16815 -- Rectified the code example for hidden_fields and visible_fields in the forms documentation. Thanks, joonas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-13 08:22:53 +00:00
Julien Phalip
c76112cf1d Fixed #4198 -- Fixed a small styling issue in the admin calendar widget. Thanks to Gary Wilson and fcurella. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-13 03:10:07 +00:00
Julien Phalip
ca1e670499 Fixed some improper quotes in the form fields reference doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-12 07:15:47 +00:00
Julien Phalip
4e47df9de2 Fixed #16291 -- Documented that TypedChoiceField does not coerce empty_value. Thanks to vanschelven and taavi223. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-12 07:12:28 +00:00
Ramiro Morales
9fe050a275 Added an implementation of bulk insert via the ORM to the Oracle DB backend. 
Refs #7596, r16739 and http://troels.arvin.dk/db/rdbms/#insert-multiple

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 23:02:53 +00:00
Ramiro Morales
26b8122087 Fixed #14675 -- Completed removal of from django.conf.urls.default import * usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
Julien Phalip
fd90453462 Fixed #16742 -- Provided code examples in the models documentation for accessing extra fields on many-to-many relationships. Many thanks to aj for the suggestion and to Nick Lang for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 19:28:18 +00:00
James Bennett
7f45651f8d Fixed #16334: Make it quite clear that cache_page's 'cache' argument refers to the name of a cache in the CACHES setting. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 05:57:38 +00:00
James Bennett
4224127b54 Fixed #16094: Added clear example of how to refer to custom permissions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 05:47:48 +00:00
James Bennett
f6d11f9b05 Fixed #16109: Corrected an inconsistency in URLconf examples for matching a numeric month. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 05:44:21 +00:00
James Bennett
23b7758f75 Fixed #16293: Document a way to return dicts with column names from a DB cursor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 05:37:55 +00:00
James Bennett
7b92ae310d Fixed #16552: Noted that contrib.sessions is a requirement for the admin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 05:31:00 +00:00
James Bennett
94524fbfef Fixed #16079: Clarified (for real this time) how handler404 and handler500 work, and that they only work in a root URLconf. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 04:01:41 +00:00
Carl Meyer
a829f85b94 Added basic release notes for 1.2.7. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 02:28:08 +00:00
Julien Phalip
88fc8657f4 Fixed #16276 -- Noted in the deployment documentation index that the Django Book 2nd ed. was written against Django 1.1. Thanks to bshaurette and bluejeansummer for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 01:12:11 +00:00
Justin Bronn
28cb5bf162 Fixed #16231 -- Added support for GML and KML on the SpatiaLite backend. Thanks, steko for the bug report and jpaulett for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 00:52:08 +00:00
Ramiro Morales
83484cc109 Fixed #14138 -- Removed a superfluous import in the sqlite3 DB backend. 
This could be of help with some issues people were seeing when deploying
Django with sqlite and Apache.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 00:52:03 +00:00
Justin Bronn
ccbca7a668 Fixed #13429 -- Changed WorldBorders to just WorldBorder in GeoDjango tutorial. Thanks, tubaman for the bug report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 00:15:43 +00:00
Justin Bronn
a25413bf86 Fixed #15305 -- Made Count aggregate and .values() play nice together on GeoQuerySets. Thanks, vrehak for the bug report and milosu for initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 00:00:15 +00:00
Justin Bronn
2918c3de74 Fixed #14648 -- Fixed annotated date querysets when GeoManager is used. Thanks, codysoyland, for the bug report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 22:53:26 +00:00
Alex Gaynor
8e1226b4a0 Kill some more dead code. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 22:46:44 +00:00
Alex Gaynor
345c4c4629 Remove a bunch of deadcode/dead imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 22:31:38 +00:00
Alex Gaynor
807b2a8216 Fixed bulk_insertion on databases which don't yet support it. Thanks to Justin Bronn for his Oracle wizardry. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 22:02:13 +00:00
Alex Gaynor
b45a4acf6f Ensure bulk_create returns the right value if the argument is an empty list. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 21:46:59 +00:00
Alex Gaynor
f2bc919ec0 Ensure bulk_create returns what it is supposed to. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 21:44:57 +00:00