Commit Graph

69 Commits

Author SHA1 Message Date
Adrian Holovaty 3ede006fc9 Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 22:46:31 +00:00
Adrian Holovaty 37a0c110e2 Fixed #913 -- Made more helpful error for list_filter error. Thanks, Tom Tobin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 06:42:28 +00:00
Adrian Holovaty 9dda4abee1 MERGED NEW-ADMIN BRANCH (except for po/mo files, which will come in a separate commit)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 21:20:09 +00:00
Jacob Kaplan-Moss 4fe5c9b7ee Fixed #906 - thanks, Esaj
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 15:00:14 +00:00
Adrian Holovaty baba996254 Added translation strings to django/contrib/admin/views/decorators.py. Taken from new-admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 02:18:37 +00:00
Adrian Holovaty 16da4e69c4 Converted django.contrib.admin.templatetags.adminmedia to use simple_tag decorator
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 01:00:52 +00:00
Georg Bauer 834e7d3482 fixed a typo in a trans template tag. Thx David Ascher (on IRC)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 18:30:31 +00:00
Adrian Holovaty cfc5786d03 Fixed missing {% load i18n %} tag in comments FREE_COMMENT_FORM template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 21:56:21 +00:00
Adrian Holovaty 6303141fbb Applied translation strings from new-admin to contrib.admin.views.doc
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 17:02:38 +00:00
Adrian Holovaty d215cbd63a Added translation strings to django.contrib.comments. Taken from new-admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 15:42:09 +00:00
Adrian Holovaty 7a80b2cc98 Fixed bug for OneToOneFields in the admin -- the manipulator_validator_unique wasn't doing the correct lookup
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-21 01:39:18 +00:00
Adrian Holovaty 09f32294e8 Fixed #845 -- flatpages middleware no longer throws 404 exception for DEBUG=True. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-20 04:55:57 +00:00
Jacob Kaplan-Moss 1da036040c Added feed configurations for django.contrib.comments
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-18 16:20:26 +00:00
Adrian Holovaty 33ffa72e40 Fixed #827 -- For admin list_display functions without a short_description, Django now converts underscores to spaces. Thanks, Aaron Swartz
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-17 15:26:50 +00:00
Adrian Holovaty 74865663bb Fixed #787 -- High-level syndication framework now picks up author details. Also updated documentation. Thanks, mattycakes
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-14 05:15:40 +00:00
Adrian Holovaty 7626cb0581 Improved Atom feed-generating framework to output <link rel='self'>. Added a feed_url hook to feedgenerator for this purpose, and changed the syndication Feed and views to use it. Also updated docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-14 04:59:20 +00:00
Georg Bauer f3319e45e4 fixes #109 - added translation possibilities for date and time formats (and updated translation files for the new message IDs)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-12 22:08:54 +00:00
Adrian Holovaty 1bf6dd7e0e Added mime_type attributes to feedgenerator RssFeed and Atom1Feed, and made the syndication view use that mime_type. Thanks, James
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-12 18:32:12 +00:00
Adrian Holovaty 944de9e9e6 Completely refactored legacy RSS framework to the new django.contrib.syndication package. Also added Atom support, changed the way feeds are registered and added documentation for the whole lot. This is backwards-incompatible, but the RSS framework had not yet been documented, so this should only affect tinkerers and WorldOnline. Fixes #329, #498, #502 and #554. Thanks for various patches/ideas to alastair, ismael, hugo, eric moritz and garthk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-12 03:44:53 +00:00
Georg Bauer d47c0a55a2 fixed the "recent actions" list not pointing to the objects detail page - backport of rjwittams fix from new_admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-12 01:16:14 +00:00
Adrian Holovaty da33b656ce Added README.TXT to contrib.redirects and contrib.flatpages
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-12 00:09:20 +00:00
Adrian Holovaty 632b63ad76 Fixed #766 -- Custom methods in admin.list_display can now have an allow_tags attribute, which doesn't strip tags in the methods' output. Thanks, plisk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-11 17:15:24 +00:00
Adrian Holovaty e0ae394e64 Small bugfix to flatpages URLconf from [1166]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-11 05:13:57 +00:00
Adrian Holovaty 1b035c35d9 BACKWARDS-INCOMPATIBLE CHANGE -- Moved flatpages and redirects to standalone apps in django.contrib that are NOT installed by default. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for full migration information.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-11 04:45:05 +00:00
Adrian Holovaty 2ef937d0fd Fixed #683 -- Lightly refactored meta.fields.Field to add an attname attribute.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-09 23:37:41 +00:00
Adrian Holovaty aae50fcce0 Fixed #758 -- HTML-escaped admin log items in admin index template. Thanks, Tom Tobin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-09 23:04:26 +00:00
Adrian Holovaty d4df074d41 Fixed #109 -- Created DATE_FORMAT, DATETIME_FORMAT and TIME_FORMAT settings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-06 23:49:03 +00:00
Adrian Holovaty 6d1b5b3b1a Fixed #727 -- Fixed leftover %() syntax in password_reset_email template. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-06 22:30:01 +00:00
Adrian Holovaty b14a50bb35 Fixed #729 -- prepopulate_from (urlify.js) now removes characters that aren't a-z, 0-9 or spaces
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-06 22:02:40 +00:00
Adrian Holovaty 181ee4ae31 Added meta.Admin list_select_related option, which specifies to use select_related in the change-list query
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-05 18:14:17 +00:00
Jacob Kaplan-Moss 5cf8f68423 Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: this means that the i18n branch is now obsolete and will be made read-only.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-04 04:59:46 +00:00
Adrian Holovaty 67d490a61d Fixed #701 -- contrib.admin.views.doc now uses get_internal_type()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-28 03:48:33 +00:00
Adrian Holovaty c6f375fd11 Fixed #700 -- urlify.js now uses hyphens instead of underscores
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-28 03:41:39 +00:00
Adrian Holovaty 1ed99862c6 Fixed #679 -- 'collapse' admin row class is now processed correctly when more than one tuple is in the admin.fields list. Thanks, malcolm
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-25 01:47:34 +00:00
Adrian Holovaty d8b8367494 Fixed #658 -- Fixed JavaScript calendar widget in IE. Thanks for the patch, kieranholland
git-svn-id: http://code.djangoproject.com/svn/django/trunk@977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-20 13:16:46 +00:00
Adrian Holovaty 539e53ccf1 Fixed #317 -- SlugField now accepts hyphens. Thanks, Sune
git-svn-id: http://code.djangoproject.com/svn/django/trunk@968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-20 04:20:52 +00:00
Adrian Holovaty 989fcce02a Fixed template-name bug for admin doc templates in [948]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-19 16:29:20 +00:00
Adrian Holovaty c548955d29 Fixed admin template bug from [948]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-19 01:18:53 +00:00
Adrian Holovaty f07e5d4f5d Fixed #627 -- BACKWARDS-INCOMPATIBLE CHANGE. Admin is now an app, not a middleware. See BackwardsIncompatibleChanges for a full list of changes and information on how to update your code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-19 01:09:05 +00:00
Adrian Holovaty fd3d579179 Added django.contrib.admin.templatetags. Refs #627
git-svn-id: http://code.djangoproject.com/svn/django/trunk@946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 23:15:47 +00:00
Adrian Holovaty 0dc843b3c6 Added contrib.admin.models.admin, which contains LogEntry (from models.auth). It still exists in models.auth, temporarily
git-svn-id: http://code.djangoproject.com/svn/django/trunk@945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 22:55:23 +00:00
Adrian Holovaty d5f32aa008 Changed contrib.admin.views.main to use staff_member_required_decorator. Refs #627. Note that, by this point, AdminUserRequired middleware is redundant -- but nothing is backwards-incompatible yet.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 05:23:07 +00:00
Adrian Holovaty c2ffd62d89 Changed django.contrib.admin.views.main to use template.loader instead of template_loader
git-svn-id: http://code.djangoproject.com/svn/django/trunk@930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 05:18:50 +00:00
Adrian Holovaty 15fb988dbc Changed contrib.admin.views.template and doc to use staff_member_required decorator. Refs #627
git-svn-id: http://code.djangoproject.com/svn/django/trunk@929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 05:12:45 +00:00
Adrian Holovaty b4fd513f9f Moved views.admin.main to contrib.admin.views.main. Refs #627. Note that this is still backwards-compatible, assuming people are using django.conf.urls.admin as their admin URLconf
git-svn-id: http://code.djangoproject.com/svn/django/trunk@927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 04:58:34 +00:00
Adrian Holovaty 055056bc31 Added django.contrib.admin.urls and django.contrib.admin.templates. Refs #627
git-svn-id: http://code.djangoproject.com/svn/django/trunk@925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 04:44:24 +00:00
Adrian Holovaty aed1930133 Moved django.views.admin.template and django.views.admin.doc to django.contrib.admin.views. Refs #627
git-svn-id: http://code.djangoproject.com/svn/django/trunk@923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 04:40:47 +00:00
Adrian Holovaty 91c67bcd45 Added django.contrib.admin, with a staff_member_required decorator and code from AdminUserRequired middleware. Refs #627
git-svn-id: http://code.djangoproject.com/svn/django/trunk@921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-18 04:21:07 +00:00
Adrian Holovaty a7efb3939f Converted load_and_render() calls to render_to_response() because of [664].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-22 22:26:56 +00:00
Adrian Holovaty a269a2058a Converted django.contrib.comments.views.* to use load_and_render
git-svn-id: http://code.djangoproject.com/svn/django/trunk@661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-09-22 05:32:47 +00:00