innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
4,908 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

79 Commits

Author SHA1 Message Date
Malcolm Tredinnick 9b52f35f35 Added "svn:eol-style native" to every text file in the tree (*.txt, *.html, 
*.py, *.xml and AUTHORS, etc). Added "svn:ignore *.pyc" to some directories in
tests/regressiontests/ that were previously missing it.

Fixed #6545, #6801.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 14:54:39 +00:00
Malcolm Tredinnick 25c4ab99e3 Fixed #6109 -- Marked fieldset descriptions as safe from auto-escaping. Good 
catch, SomeGuy.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-03 07:39:10 +00:00
Malcolm Tredinnick f27365e5bd Fixed #6061 -- Don't escape help_text in the admin interface (so that it 
behaves as documented). Thanks, baumer.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-30 19:59:13 +00:00
Malcolm Tredinnick 0171f00761 Fixed #5706 -- Fixed a couple of XHTML incompatibilities. Based on a patch from 
tvrg.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-29 16:32:29 +00:00
Malcolm Tredinnick 356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 12:58:53 +00:00
Gary Wilson Jr 04a110836d Fixed #3491 -- Fixed links in `user-tools` section of admin's `base.html` template to use the `url` template tag. This also removes the need for child templates to override the block just to adjust the relative path. Thanks, saintsjd@gmail.com. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-20 06:59:13 +00:00
Russell Keith-Magee 09145d2e5f Fixed #208 -- Modernized the syntax of the cycle tag to allow for spaces and variables in cycle values. Thanks to SmileyChris and Chris McAvoy for their work on this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 02:49:21 +00:00
Malcolm Tredinnick a901af5f58 Fixed #5155 -- Translated the model name (when available) in the Recent Actions log. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 05:40:47 +00:00
Adrian Holovaty 9ee6326cb6 Fixed #5019 -- Fixed broken links in navigation of 'change password' admin page. Thanks, hpxchan@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-12 03:26:35 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Adrian Holovaty 2144a2c23f Fixed #3269 -- Fixed typo in admin change_password.html template. Thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-10 22:34:37 +00:00
Adrian Holovaty 7180207328 Fixed #3166 -- Added admin 'Change user password' view. Thanks for the patch, SmileyChris 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-30 07:16:25 +00:00
Jacob Kaplan-Moss 069a8858ba Fixed #3128: Added explicit object-tools block so custom admin templates can override it where needed. Thanks, Gary Wilson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-20 05:00:36 +00:00
Adrian Holovaty c7345f4e0f Fixed bug in admin with raw_id_admin -- change list in popup didn't append 'pop' link to the 'total' link. Thanks for reporting, patrickk 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-06 06:23:59 +00:00
Adrian Holovaty 60b46d72ac Fixed #648 -- Added comment syntax to template system: {# #}. Thanks for the patch, mccutchen@gmail.com and Hawkeye 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-24 21:30:38 +00:00
Malcolm Tredinnick 876a3ed602 Fixed #2587 -- Removed some escaping from the summary fields. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 11:58:56 +00:00
Adrian Holovaty 513ae3a3f4 Fixed #2587 -- Removed unnecessary escaping from admin_doc/model_detail.html template. Thanks for reporting, Gary Wilson 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-22 04:53:43 +00:00
Adrian Holovaty eefe35c7fa Changed admin/base.html template to add a NONE,NOARCHIVE meta tag for robots. Thanks for the idea, Ian Holsman 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-17 23:05:42 +00:00
Adrian Holovaty 3e51dac933 Fixed #2533 -- Fixed XHTML error in admin edit_inline_tabular.html template. Thanks, erikg@codepoet.no 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-12 17:42:02 +00:00
Adrian Holovaty 9354cfb6ce Fixed #2410 -- Added HTML ID attribute to <form> on admin change-list pages, for easy targetting with JavaScript and CSS 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-12 05:42:48 +00:00
Adrian Holovaty fd5d923c6b Fixed #61 -- No more editing hashes when creating users via the admin. Created a special-case 'Add user' admin view. The change form still displays the hash, for the moment. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-04 04:18:12 +00:00
Jacob Kaplan-Moss 1687b025dc Part 3 of pedant day: replaced all tabs in Django with spaces. Python the way Guido intended it, baby! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-21 20:48:17 +00:00
Malcolm Tredinnick 51705f60b1 Fixed #2332 -- Introduced is_authenticated() method on User and AnonymousUser classes. Recommended its use over is_anonymous in the docs. Changed internal Django use to match this recommendation. Thanks to SmileyChris and Gary Wilson for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-19 02:09:26 +00:00
Malcolm Tredinnick 6d104115d1 More pre-emptive escaping of strings that should not be interpreted as HTML. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-15 01:07:13 +00:00
Malcolm Tredinnick ebc6f90d44 Escaped variables that should not be interpreted as HTML and which might 
contain dangerous characters.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 11:48:25 +00:00
Malcolm Tredinnick 1725db5a35 Escaped all strings that should not contain active HTML tags. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 11:04:33 +00:00
Malcolm Tredinnick 04e83a0517 Fixed another title string that needed escaping (these strings do need 
escaping, because they can be created from object strings, in part).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 01:17:17 +00:00
Malcolm Tredinnick 24fa22883a Fixed #2346 -- Escaped string output in titles in admin interface. Thanks Gary 
Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 01:03:01 +00:00
Malcolm Tredinnick 49bb884d0b Fixed #2345 -- escaped object titles in breadcrumb display in admin. Thanks 
Gary Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 01:00:09 +00:00
Malcolm Tredinnick 2175c99825 Fixed #2344 -- Filtered some object string representations through the escape 
filter.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 00:49:18 +00:00
Adrian Holovaty 16c5cec9c1 Fixed #2290 -- Escaped HTML in admin messages. Thanks, Sean 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-07 03:56:15 +00:00
Adrian Holovaty a25fe3b65e Changed admin/templates/admin/index.html to make <caption> translatable 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-04 03:57:07 +00:00
Adrian Holovaty 2673aa366a Fixed #2275 -- Added footer hook to admin base.html template 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-30 19:21:02 +00:00
Adrian Holovaty c8f1d0a84e Fixed #2186 -- Fixed i18n variable substitution in admin/templates/registration/password_reset_email.html. Thanks, md@hudora.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-18 17:32:15 +00:00
Adrian Holovaty 8938d5eeb3 Fixed #2152 -- Now HTML-escaping user.first_name in admin/base.html template 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-14 14:56:19 +00:00
Georg Bauer 4fcb72d306 fixed #2128: updated BiDi support 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-12 14:52:51 +00:00
Adrian Holovaty 3db34ce73e Fixed #2100 -- Made some remaining parts of the admin changelist translatable. Thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-07 03:17:58 +00:00
Georg Bauer 7e88ec5271 fixed #2089: added language bidirectional support and updated the admin to use it. thanks meir@mksoft! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-06 15:22:53 +00:00
Adrian Holovaty 066dac168d Fixed #2084 -- Removed admin-site 'documentation / change password / log out' links on login page for users who are logged in but don't have staff status. Thanks, rudolphfroger 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-05 00:21:12 +00:00
Adrian Holovaty 350c360776 Negligible spacing change to admin/templates/admin/field_line.html 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-01 03:37:59 +00:00
Adrian Holovaty f10af2de24 Fixed #2056 -- Escaped history messages in admin. Thanks, SmileyChris 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-01 02:10:44 +00:00
Adrian Holovaty 2543d0ae93 Fixed bug in admin where it would redirect infinitely if invalid lookup parameters were given in the URL. Refs #2024 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-31 15:25:23 +00:00
Adrian Holovaty ea59344d72 Fixed #2006 -- Admin now quotes strings in breadcrumbs and filters. Thanks, mhf@hex.no 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-31 15:10:01 +00:00
Jacob Kaplan-Moss 20416b2972 Made a few small tweaks to admin doc pages. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-18 15:17:42 +00:00
Adrian Holovaty f2ef28fd5c Fixed #1728 -- Fixed broken nav links in password_change_done admin page. Thanks for reporting, mdt@emdete.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-05 03:02:11 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-02 01:31:56 +00:00
Jacob Kaplan-Moss b830fa7e78 Exposed model __doc__ in admin docs views which fixes #1408. Thanks, poelzi 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-27 21:05:50 +00:00
Jacob Kaplan-Moss 0df9fb8f9a Fixed #620 -- raw_id_admin and limit_choices_to now play well together (thanks to David Schein) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-27 18:52:54 +00:00
Adrian Holovaty a5fad0eb37 Fixed #1387 -- Fixed some XHTML errors in admin templates. Thanks, vineet 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-02-23 19:05:40 +00:00
Adrian Holovaty 23d2be1714 Fixed #1274 -- Fixed broken link in navigation in admin password-change template. Thanks, Brian Ray 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-27 15:45:10 +00:00