mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Code Issues 25 Releases Wiki Activity
9,441 Commits 28 Branches 426 Tags 666 MiB
3ae9117c46
Commit Graph

9441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Beaven
3ae9117c46 Fixes #7817 and #9456. 
- The include tag now has a 'with' option to include to provide extra context
  vairables to the included template.

- The include tag now has an 'only' option to exclude the current context
  when rendering the included template.

- The with tag now accepts multiple variable assignments.

- The with, include and blocktrans tags now use a new keyword argument format
  for variable assignments (e.g. `{% with foo=1 bar=2 %}`).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-18 02:50:26 +00:00
Adrian Holovaty
99742d8d73 Fixed it's -> its in multi-db.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-16 22:37:29 +00:00
Ramiro Morales
87315cc22d Fixed #2411 -- Fixed some XHTML validation errors in admindocs pages. Thanks to James Wheare for the report and to Simon Greenhill for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-16 12:11:20 +00:00
Jarek Zgoda
689234890c Fixed #14906: lost context-based translations for Polish 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-15 14:48:19 +00:00
Timo Graham
dc2a3f8280 Fixed #14848 - change example verbose name to match convention. thanks madisv for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-14 23:43:36 +00:00
Timo Graham
c3143783ca Fixed #14901 - Typo in class-based views paginator doc. thanks adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-14 23:34:47 +00:00
Jarek Zgoda
f7f7587958 Polish translation update 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-14 11:53:18 +00:00
Chris Beaven
5c86831ac5 Tiny doc fix. Thanks kizzo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-14 00:37:42 +00:00
Alex Gaynor
68548c3eff Fixed #14897 -- fixed some synax highlighting in the formset documentation. Thanks to marcusf for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-13 19:37:18 +00:00
Jannis Leidel
6ec348fb41 Fixed #13726 -- Further refine changes made in r12384 and r13069 for using non-English source languages in JavaScript translation catalogues. Thanks, Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-13 13:52:52 +00:00
Jannis Leidel
2478f8588e Updated date format strings of languages that require alternate month names. Refs #14570 because it uses the new format character added for this purpose. Thank you, shell_dweller. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-13 13:52:21 +00:00
Jannis Leidel
7292af8542 Fixed #14570 -- Added new date format character for alternative month names using the new context capabilities. Also add context to Associated Press style month names (refs #9988). Thanks to Claude and shell_dweller. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-13 13:51:28 +00:00
Luke Plant
dc8c4f0879 Reverted [13998] because it never worked. 
Refs #5425, #14844

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-13 13:20:02 +00:00
Jannis Leidel
05eb53603c Fixed #14187 -- Added support for bpython to shell management command. Thanks, Jeremy Dunck. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 23:03:24 +00:00
Jannis Leidel
47a5153da4 Fixed #12735, #14892 and #11542 -- Fixed support for the latest IPython (development) version in the shell management command and added a hook to implement additional shell runners (by subclassing django.core.management.commands.shell.Command, extending the `shells` attribute and implement a method with the same name). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 23:03:03 +00:00
Jannis Leidel
9ab85e05e2 Fixed #4030 -- Added ability to translate language names. Thanks to Antti Kaihola and Ramiro Morales for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 23:02:45 +00:00
Jannis Leidel
5fa1169f33 Fixed #14821 -- Documented the differences in formatting syntax in formats modules. Thanks, Claude. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 23:02:10 +00:00
Jannis Leidel
1aca34cde2 Fixed #14868 -- Added CSS rule to prevent long text from overflowing the "recent actions" box on the admin index page. Thanks, Chris Adams. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:59:47 +00:00
Jannis Leidel
674c671cae Fixed #14731 -- Respect ordering when creating the default permissions. Thanks, chipx86. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:59:28 +00:00
Jannis Leidel
867e935c51 Fixed #14446 -- Prevented the password reset confirmation view to be cached. Thanks, Paul and Gabriel. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:59:03 +00:00
Jannis Leidel
d8165ce156 Fixed #14312 -- Raising an `IncorrectLookupParameters` if the page number given to an admin change list exceeds the number of the last page. Thanks, mk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:58:47 +00:00
Jannis Leidel
a03a8adb3e Fixed #14268 -- Start the deprecation of the reset and sqlreset management command. Thanks, Carl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:58:25 +00:00
Jannis Leidel
3d35ac7868 Fixed #14158 -- Fixed SelectMultiple._has_changed to not assume same order of data anymore. Thanks, akaariai and dmoisset. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:57:58 +00:00
Jannis Leidel
34daa0804c Fixed #14144 -- Made sure custom validators are called in ModelMultipleChoiceFields. Thanks, matiasb. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:57:37 +00:00
Jannis Leidel
dad28e8557 Fixed #14103 -- Take USE_ETAGS setting into account when patching the response headers. Thanks, trbs and Eric Holscher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:57:17 +00:00
Jannis Leidel
8dfd3dfd49 Fixed #14805 -- Capitalize "Google" in sitemaps docs. Thanks, Adam. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:52 +00:00
Jannis Leidel
d0257a1558 Fixed #14041 -- Added ability to override the template of the sitemaps views. Thanks, julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:29 +00:00
Jannis Leidel
b3520da9ac Fixed #13862 -- Added an ordering option to InlineModelAdmin and cleaned up documentation for it a bit. Thanks, Simon Meers, rasca and cogat. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:56:01 +00:00
Jannis Leidel
1e7bb904df Fixed #13856 -- Float admin's top links on the right for RTL languages. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:55:33 +00:00
Jannis Leidel
966d3562d4 Fixed #13649 -- Extended admin stylesheets to also cover disabled buttons in the admin. Thanks, Sebastian Noack. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:55:10 +00:00
Jannis Leidel
2c2209b473 Fixed #13607 -- Auto-initialize admin's date hierarchy links intelligently. Thanks, Simon Meers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:54:50 +00:00
Jannis Leidel
88ff656731 Fixed #12955 -- Use the size attribute of the file instead of len() to support uploads larger than 2GB. Thanks, swiedenroth and isagalaev. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:54:22 +00:00
Jannis Leidel
6261593b99 Fixed #11990 -- Show the correct URLconf in the technical 404 template even if it was overridden, e.g. in a middleware. Thanks, mattbennett. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:54:04 +00:00
Jannis Leidel
462d3115a3 Fixed #5672 -- Allow the separator in the get_text_list utility function to be translated. Thanks, Claude. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:53:49 +00:00
Alex Gaynor
575962c213 Fixed #14499 -- ATSocialSecurityNumberField now responds to all EMPTY_VALUES correctly. Also converted Austrian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 04:33:50 +00:00
Alex Gaynor
aa05224dba Converted the Argentina localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 04:33:38 +00:00
Timo Graham
9af06cbb63 Fixed #14863 - Add contrib.messages and staticfiles to list of default INSTALLED_APPS in tutorial. thanks tgm for report and adamv for patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-11 15:04:25 +00:00
Timo Graham
82f2daaf45 Fixed #11470 - add documentation for ModelAdmin.message_user. thanks adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-11 13:51:14 +00:00
Timo Graham
f0753ef211 Fixed #14875 - moved mention of email_re in 1.2 release notes from features deprecated to backwards incompatible changes. thanks galund for the report and elbarto for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-11 13:29:47 +00:00
Chris Beaven
2e909489d7 Add FormMixin.get_form_kwargs method to abstract some common logic in a tidier 
way. Tidy up (and amend) documentation about FormMixin and ModelFormMixin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-10 03:51:30 +00:00
Chris Beaven
ff8711a825 Fixes #14873 -- A paginated ListView with a List instead of queryset produces an error. 
Additional minor change in functionality: the page is now not considered paginated if the objects do not span multiple pages according to the paginator. This will only affect views with a custom paginator method which uses orphans.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-09 02:34:14 +00:00
Russell Keith-Magee
b37d867929 Fixed #14867 -- Corrected references to baking in the new TemplateResponse docs. Thanks to marcusf for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-09 00:47:37 +00:00
Ramiro Morales
c58d25cf8d Fixed a couple of typos and small errors from r14696 and r14822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-09 00:26:59 +00:00
Ramiro Morales
e0d8c5fca2 Fixed error introduced in r14666 that results in the message reporting the test DB name to be created being shown actually after the real action when the operation fails. 
Implemented that by factoring out calculation of test DB name to an internal method.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-08 23:48:28 +00:00
Alex Gaynor
a4898dc50b Fixed the world's ugliest syntax (that's not an actual error) that snuck in with [14857]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-08 18:37:00 +00:00
Alex Gaynor
2a46323124 Fixed #14870 -- don't catch AttributeErrors in database router methods, instead check that the method itself exists. Thanks to jonash for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-08 18:31:57 +00:00
Ian Kelly
b8c368feb2 Replaced an ImportError with ImproperlyConfigured in the Oracle backend. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-08 07:56:43 +00:00
Alex Gaynor
3863c906ce Ensure that a Popen object is closed promptly during the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-08 04:03:07 +00:00
Gabriel Hurley
68a04f2d62 Fixed #14855 -- General cleanup of the new TemplateResponse docs (grammar, spelling, reST). Thanks to adamv for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-08 00:27:07 +00:00
Russell Keith-Magee
061a9cad67 Corrected typo in middleware docs. Thanks to matt_c for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-07 14:59:57 +00:00