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

1135 Commits

Author SHA1 Message Date
Adrian Holovaty 62362c6175 Added comment to UserAdmin.add_view() explaining why we disallow users without change permissions from adding other users. Refs #9866 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-25 06:04:11 +00:00
Karen Tracey bcd63cbfb0 Fixed #6160, #9111 -- Consistently apply conditional_escape to form errors and labels when outputing them as HTML. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-06 19:49:24 +00:00
Malcolm Tredinnick fb62bcc69e Fixed #8321 -- Change django.contrib.auth.models to use django.utils.hashcompat 
for consistency with other code. Thanks, magneto.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-06 05:14:17 +00:00
Malcolm Tredinnick c58c1f43cf Fixed #5753 -- Allow createsuperuser to work in situations where there 
might be a valid password database entry for the current user id.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-06 04:54:14 +00:00
Malcolm Tredinnick 2f0be0faae Fixed #8660 -- Small database query optimisation in User.get_profile. 
When calling User.get_profile(), we now tell the profile object about the
related User object right away. This can save a database lookup later if
something in the user profile object wants to refer to the user object.

Patch from Mike Malone.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-05 12:07:10 +00:00
Brian Rosner ab13303ea4 Fixed #8433 -- Deal with the add user popup on models that foreign key to User correctly. Thanks sorl for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 21:24:33 +00:00
Gary Wilson Jr c2ba59fc1d Removed oldforms, validators, and related code: 
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
 * Removed oldforms specific bits from model fields:
   * Removed `validator_list` and `core` arguments from constructors.
   * Removed the methods:
     * `get_manipulator_field_names`
     * `get_manipulator_field_objs`
     * `get_manipulator_fields`
     * `get_manipulator_new_data`
     * `prepare_field_objs_and_params`
     * `get_follow`
   * Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
 * Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
 * Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
 * Serialization framework
   * `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
   * Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
 * Removed `django.core.validators`:
   * Moved `ValidationError` exception to `django.core.exceptions`.
   * For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
 * Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
 * Removed an oldforms-style model creation hack (refs #2160).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 07:19:44 +00:00
Malcolm Tredinnick 157dbe2fff Fixed #8552 -- Use the LOGIN_REDIRECT_URL setting in the auth tests, rather than hard-coding the value. 
This enables things to work properly when installed in other configurations.
Patch from aeby.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 06:02:13 +00:00
Jacob Kaplan-Moss 78d13fb1c2 Fixed #8379: the admin user change form now properly validates the username. Thanks, kratorius. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 17:10:20 +00:00
Jacob Kaplan-Moss 9a1e4cedde Fixed #8344: make User.get_profile() work when settings.AUTH_PROFILE_MODULE is unset. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 16:56:59 +00:00
Jacob Kaplan-Moss 15ed0d65b0 Fixed #7833: the user creation form now works when password1 isn't set. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-25 16:55:57 +00:00
Russell Keith-Magee 96d12748a9 Added app_label to the context for the add user admin view. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-24 06:46:53 +00:00
Malcolm Tredinnick aa78a05e69 Fixed #8359 -- Add an admin log entry when creating a new user. 
Patch from evan_schulz.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 21:45:36 +00:00
Malcolm Tredinnick abb1c508cc Tests for password change process. Thanks, Mike Richardson. Fixed #8402. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 18:20:49 +00:00
Brian Rosner ab26efc952 Fixed #8493 -- Fixed a NoReverseMatch when redirecting to password_change/done/ in the admin. Added the ability to override redirects to other password change views for consistency. Thanks for the report mtrichardson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 03:26:01 +00:00
Malcolm Tredinnick c8c159cbba When logging in, change the session key whilst preserving any existing 
sesssion. This means the user will see their session preserved across a login
boundary, but somebody snooping the anonymous session key won't be able to view
the authenticated session data.

This is the final piece of the session key handling changes.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-21 13:54:53 +00:00
Gary Wilson Jr 3bb50169d9 Removed unused and redefined imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-15 17:42:13 +00:00
Gary Wilson Jr 415bf3efb3 Fixed #7364 -- Never cache the contrib.auth login view. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-15 17:10:14 +00:00
Malcolm Tredinnick 97a7dab2b1 Fixed #6941 -- When logging a user out, or when logging in with an existing 
session and a different user id to the current session owner, flush the session
data to avoid leakage. Logging in and moving from an anonymous user to a
validated user still keeps existing session data.

Backwards incompatible if you were assuming sessions persisted past logout.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-14 03:58:00 +00:00
Jacob Kaplan-Moss bb30805452 Fixed #8131: use reverse() in auth views. Patch from davenaff. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-12 23:31:31 +00:00
Gary Wilson Jr f09f14d0ae Fixed #8226 -- Fixed a Python 2.3 incompatibility in a unicode string substitution, thanks nfg. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-11 15:13:00 +00:00
Gary Wilson Jr 0b01d50076 Refs #7742 -- Removed unused `validator_list` argument (this is already being checked by the `UserCreationForm`). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-11 04:30:30 +00:00
Brian Rosner a7d3c92767 Fixed #8202 -- Moved user_change_password to UserAdmin. This enables seamless integration of a custom UserAdmin. Thanks ElliottM for catching this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 09:43:48 +00:00
Brian Rosner baac791c4b Fixed #7932 -- Made it easier to use a custom User model with the admin. Added add_form attribute to UserAdmin and removed hard-coded dependancies to User. Thanks ElliottM for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-10 04:22:21 +00:00
Jacob Kaplan-Moss 19bbc74e46 Fixed #7115: tweaked ordering on Permission to more closely match the pre-QSRF behavior, which was nice. Thanks, Matthew Flanagan. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 21:24:02 +00:00
Jacob Kaplan-Moss 34a3bd5225 Major refactoring of django.dispatch with an eye towards speed. The net result is that signals are up to 90% faster. 
Though some attempts and backwards-compatibility were made, speed trumped compatibility. Thus, as usual, check BackwardsIncompatibleChanges for the complete list of backwards-incompatible changes.

Thanks to Jeremy Dunck and Keith Busell for the bulk of the work; some ideas from Brian Herring's previous work (refs #4561) were incorporated.

Documentation is, sigh, still forthcoming.

Fixes #6814 and #3951 (with the new dispatch_uid argument to connect).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-06 15:32:46 +00:00
Luke Plant 8e24b37610 Cleaned up whitespace 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-05 16:36:20 +00:00
Russell Keith-Magee bf65fd0a80 Fixed #8901 -- Corrected typo in docstring. Thanks to Hayley Bonham <djangocode@vortex.cx> for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-04 12:11:04 +00:00
Gary Wilson Jr c85c8f8891 Fixed #7919 -- md5 and sha modules are deprecated since Python 2.5, use hashlib module when available. Patch from Karen Tracey. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-02 05:56:57 +00:00
Luke Plant 8dff194e9b Fixed #3062 - removed arbitrary and unneeded max_length on password fields in auth forms. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-01 21:18:17 +00:00
Luke Plant 64f5ab67a5 Changed some URL conf regexes to rawstrings for consistency 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-01 16:18:24 +00:00
Luke Plant 079e5bf1ec Added a login link to the password reset completion screen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-01 16:13:12 +00:00
Luke Plant fcd837cd0f Fixed #7723 - implemented a secure password reset form that uses a token and prompts user for new password. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-31 20:47:53 +00:00
Russell Keith-Magee 99e34c1846 Fixed #8042 -- Modified the password reset form so that the email field length matches the User model. Thanks to Bob Thomas <bthomas@ncircle.com> for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-31 09:08:55 +00:00
Adrian Holovaty 29f0e8182f Fixed #7847 -- Removed a whole bunch of unused imports from throughout the codebase. Thanks, julien 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 03:24:09 +00:00
Adrian Holovaty 8bc442e771 Fixed #7304 -- Gave AnonymousUser a has_perms() method, which it was lacking 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 03:05:40 +00:00
Jacob Kaplan-Moss 46786b4193 Fixed #7741: django.newforms is now django.forms. This is obviously a backwards-incompatible change. There's a warning upon import of django.newforms itself, but deeper imports will raise errors. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 01:22:26 +00:00
Brian Rosner a19ed8aea3 Merged the newforms-admin branch into trunk. 
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 23:54:34 +00:00
Gary Wilson Jr 56e1cdc8bc Fixed a long and complex line by breaking into a for loop, with the added benefit that the method will now exit as soon as a matching 
permission is found instead of checking all of the user's permissions and putting them into a temporary list.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-02 05:05:50 +00:00
Gary Wilson Jr 73dfef8771 Added docstring and other minor style fixes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-02 05:00:09 +00:00
Russell Keith-Magee 8cb128e57c Refs #7521 -- Re-reverted [7716] (originally reverted in [7726]), now modified to use the new TestCase urlpattern framework. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-30 13:11:12 +00:00
Malcolm Tredinnick 339df5ce44 Fixed #6089 -- Removed default ordering on the User class. 
Admin users are still ordered, since we add it in specially for Admin. Slightly
backwards incompatible.

Patch from Erik Karulf.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-30 12:52:46 +00:00
Adrian Holovaty fbef599f60 Fixed #6306 -- redirect_to_login() helper function now quotes the URL arguments correctly. Thanks, SmileyChris 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 04:11:53 +00:00
Adrian Holovaty 54f7da3a27 Fixed #7274 -- Improved the django.contrib.auth password_reset() view not to require the Sites framework. Thanks, joshrl 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 04:09:29 +00:00
Russell Keith-Magee c8d39f15cb Fixed #7521 -- Reverted [7716]. Fixed URLs in test case broke any application that deployed contrib.auth. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-23 12:17:57 +00:00
Luke Plant fad8e8f7c2 Added basic tests for auth.views.password_reset 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-20 17:43:12 +00:00
Jacob Kaplan-Moss 2b62e945b0 Fixed #3393: login view no longer assumes that set_test_cookie has been called. This is mildly backwards-incompatible, but in the "now it works the way it should have all along" sense. Thanks to James and lcordier for the patches. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-18 16:13:14 +00:00
Jacob Kaplan-Moss b0ebcfe15a Fixed #7394: fixed bug with syncdb and createsuperuser introduced in [7590]. Thanks, av0000@mail.ru 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-08 18:18:01 +00:00
Russell Keith-Magee 8398ea6603 Fixed #7392 -- Corrected a typo in the backwards-compatibility layer to the new createsuperuser command. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-08 08:45:14 +00:00
Jacob Kaplan-Moss 5675ae4443 Fixed #5614: added 'manage.py createsuperuser'. Thanks, programmerq. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-08 05:31:16 +00:00
Malcolm Tredinnick 6dfe245f02 Updated the inline help text for User.is_active. 
Fixed #6881. Refs #7011.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-13 01:50:29 +00:00
Gary Wilson Jr a75e58be58 Fixed #5922 -- Turned `ModelBackend` authentication backend into a new-style class, thanks `Honza_Kral`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-08 03:09:29 +00:00
Gary Wilson Jr 5ca0b9203b Fixed #5701 -- Fixed decorators to take the name, attributes, and docstring of the function they decorate by adding a modified version of the `functools.wraps` function from Python 2.5. `wraps` has been altered to work with Django's `curry` function and with Python 2.3, which doesn't allow assignment of a function's `__name__` attribute. This fixes severaly annoyances, such as the online documentation for template filters served by the admin app. This change is backwards incompatible if, for some reason, you were relying on the name of a Django decorator instead of the function it decorates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-02-25 06:02:35 +00:00
Gary Wilson Jr 298d76aed4 Fixed #3165 -- Really allow underscores when making a superuser, thanks `SmileyChris`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-01-13 04:03:36 +00:00
Gary Wilson Jr a4478ee9c6 Fixed #6174 -- Made `AnonymousUser.is_active` False instead of True since `AnonymousUser`s can't login. Thanks, `SmileyChris`. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-11 06:37:07 +00:00
Luke Plant 8c9b65429a Fixed bug in /admin/doc/views/ caused by [6658] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-09 15:27:49 +00:00
Luke Plant 8eeb9feab0 Fixed #4376 -- login_required now works with bound methods. Thanks, Steven Bethard. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-07 22:45:07 +00:00
Malcolm Tredinnick 212aa32e2a Fixed #5798 -- Added a missing translation marker. Thanks, maru. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-10-27 04:34:50 +00:00
Russell Keith-Magee d95c0fd017 Fixed #5636 -- Added missing Set import for Python2.3 support. Thanks, wangchun@exoweb.net. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-30 04:11:29 +00:00
Jacob Kaplan-Moss f857e37776 Fixed $5457 - the auth system now delegates permission checking to auth backend(s). As an added bonus, the auth backends now have some unit tests! Thanks, Florian Apolloner. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-19 16:50:30 +00:00
Adrian Holovaty bcfaa73514 Fixed #3604 -- django.contrib.auth password checking now uses hashlib if it's available. Thanks, Rob Hudson 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 19:45:33 +00:00
Jacob Kaplan-Moss 40702fe2f0 Small change to modpython auth handler to support Apache 2.2 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 18:36:31 +00:00
Malcolm Tredinnick 388182b622 Fixed #3032 -- Added some useful methods and attributes so that AnonymousUser can proxy for a User a bit more logically. Patch from semenov. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-15 18:01:29 +00:00
Adrian Holovaty ddd3d7c71f Fixed #5308 -- Redirect from pages that need login and have Unicode URL no longer causes error. Thanks, webjunkie 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 21:53:15 +00:00
Adrian Holovaty 55d6aebfec Fixed #5394 -- REDIRECT_FIELD_NAME is now configurable. Thanks, Petr Marhoun, DavidReynolds and effbot 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 19:25:37 +00:00
Adrian Holovaty 375c88d2bc Fixed #5227 -- Made the redirect security check in django.contrib.auth.views.login() tighter. Thanks, Sander Dijkhuis 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-25 18:34:28 +00:00
Adrian Holovaty 221f99ed58 Refactored quote_name() to DatabaseOperations.quote_name(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 01:03:33 +00:00
Adrian Holovaty b38375ee4c Fixed bug in [5885] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-14 22:26:34 +00:00
Adrian Holovaty 6aae9b2aa4 Changed django.contrib.auth.views.login to use RequestSite if the sites framework is not installed -- i.e., the sites framework is no longer required to use this view. See also [5654] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-14 22:08:11 +00:00
Gary Wilson Jr 212ee65be7 Fixed #2101 -- Renamed `maxlength` argument to `max_length` for oldforms `FormField`s and db model `Field`s. This is fully backwards compatible at the moment since the legacy `maxlength` argument is still supported. Using `maxlength` will, however, issue a `PendingDeprecationWarning` when used. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-05 05:14:46 +00:00
Simon Willison fd2b99b5f1 After discussing with Malcolm, added set_unusable_password() and has_usable_password() methods to the User object, plus tests and updated documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-28 18:30:40 +00:00
Russell Keith-Magee 6335317a42 Fixed #3505 -- Added handling for the error raised when the user forgets the comma in a single element tuple when defining AUTHENTICATION_BACKENDS. Thanks for the help identifying this problem, Mario Gonzalez <gonzalemario@gmail.com>. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-13 05:03:33 +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
Malcolm Tredinnick 179f478ffe Fixed #4751 -- Fixed that AnonymousUser.__str__ to always return a string 
object, as required by Python.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-03 12:24:46 +00:00
Malcolm Tredinnick 17145eef4c Removed unneeded import. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-25 16:10:33 +00:00
Malcolm Tredinnick 08aa5c585b Fixed #4607 -- Tweaked checks for features missing in Python 2.3 to not assume 
things Python does not guarantee. Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-23 03:18:22 +00:00
Luke Plant 18619a11ee Fixed behaviour of contrib.auth.forms.PasswordResetForm when more than 
one User have the same e-mail address.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5493 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-19 20:04:54 +00:00
Malcolm Tredinnick 44dd91ec6d Fixed #4015 -- Changed login() and logout() messages to update request.user if 
it is relevant. Thanks James Bennett, Vinay Sajip and Gary Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-15 01:53:40 +00:00
Malcolm Tredinnick 74bab89178 Fixed #3379 -- Changed login() so that we update last_login when a user 
logs in. Thanks, arvin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-25 09:44:06 +00:00
Malcolm Tredinnick 2a7d9ef23f Fixed #3316 -- Added support for crypt hashing of passwords, mostly to support 
easy porting from existing Unix-based legacy apps. Thanks, axiak@mit.edu.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-25 09:34:29 +00:00
Malcolm Tredinnick 5dfe74f221 Fixed #3185 -- Made values for login, logout and post-login redirect URLs 
configurable. This is a combined patch from Vasily Sulatskov, Marc Fargas and
Collin Grady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-25 08:49:57 +00:00
Malcolm Tredinnick 00cb6a1ba8 Fixed #4107 -- Marked a few more strings for translation. Thanks, Baptiste. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-23 05:51:29 +00:00
Russell Keith-Magee bbeb62c9af Backwards-incompatible change -- Removed LazyDate helper class. To preserve existing functionality, query arguments can now be callable. Callable query arguments are evaluated with the query is evaluated. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 13:28:09 +00:00
Adrian Holovaty c7f6cd0243 Added blank lines around Meta and Admin classes in django.contrib.auth.models 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-07 04:21:31 +00:00
Adrian Holovaty 796b2304f3 Fixed #3773 -- Added app_label to Permission.__str__(), so that the admin permission list is easier to use with multiple permissions of the same name. Thanks, mrmachine 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-25 21:28:59 +00:00
Malcolm Tredinnick 6c4757729b Revert [4485] in order to fix accidental mod_python breakage. Refs #2920. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-11 23:50:35 +00:00
Russell Keith-Magee 0e924c70b1 Refs #2920 -- Replaced implicit uses of _() with explicit imports or calls to gettext(). At some point post 0.96, we need to remove the calls that put _ into the builtins. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-11 06:20:52 +00:00
Russell Keith-Magee f9cdde0cb4 Fixed #3162 -- Added coded to catch and rethrow exceptions that are thrown by the views visited by the test client. Thanks, Ben <afternoon@uk2.net>. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-11 00:23:31 +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
Adrian Holovaty 706fcec164 Copied django.forms to django.oldforms and changed all code to reference django.oldforms instead of django.forms. Updated docs/forms.txt to add 'Forwards-compatibility' section that says you should not be using django.oldforms for any new projects. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-12-15 18:00:50 +00:00
Adrian Holovaty 41d11a685f Fixed #2968 -- Changed arguments to __import__ to use empty dictionary instead of empty string, for stricter compliance with Python library reference. Thanks for the patch, Yasushi Masuda 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-30 20:50:27 +00:00
Adrian Holovaty fa49edc7bd Fixed #2890 -- Added default values of False for auth.User is_staff and is_superuser. Thanks for the suggestion, dummy@habmalnefrage.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-24 20:45:28 +00:00
Adrian Holovaty 179d410a7a Fixed #2937 -- Added __eq__, __ne__ and __hash__ for AnonymousUser. Thanks, favo@exoweb.net 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-24 16:42:03 +00:00
Russell Keith-Magee c3c090ab13 Fixes #2915 -- Fixed typo in validation error message. Thanks, Matt Riggott. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-17 00:45:46 +00:00
Russell Keith-Magee fa4bb1b093 Clarified documentation to indicate that authenticating a user doesn't imply that they are active. Reinforced the fact that has_perm only returns true if user is active, and fixed a minor bug to that effect. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-30 01:21:03 +00:00
Adrian Holovaty 2170110df9 Fixed #2704 -- Fixed error in create_superuser. It was failing for invalid usernames. Thanks for reporting, jmu 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 15:28:07 +00:00
Malcolm Tredinnick 6b4eb8bb70 Removed an unnecessary import from r3857. I'd forgotten that _() was put into 
the global namespace.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 13:59:10 +00:00
Malcolm Tredinnick 9b034d2746 Fixed #2816 -- Marked a couple more translatable strings. Thanks, ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-26 03:42:27 +00:00
Adrian Holovaty 227626dcd0 Fixed typos and improved documentation for permission_required decorator addition from [3779] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-25 17:33:17 +00:00
Georg Bauer 182b5c5b5c fixed #2731: updated password change form to allow translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-25 13:53:41 +00:00
Malcolm Tredinnick 9e05fc1598 Fixed #2770 -- Fixed a database connection leak in 
django.contrib.auth.handlers.modpython.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-22 12:01:15 +00:00
Malcolm Tredinnick 6be701eba1 Fixed #2629 -- Added a permission_required decorator to 
django.contrib.auth.decorator. Thanks, dummy@habmalnefrage.de.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-22 01:44:28 +00:00
Adrian Holovaty 3c5782287e Fixed #2702 -- Fixed LazyUser to store cache as attribute of request, not class. Thanks for the patch, jkocherhans 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-12 17:30:47 +00:00
Adrian Holovaty a4bd32770c Fixed #2624 -- Fixed typo in docstring for Permission model. Thanks, david@dawninglight.net 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-30 16:39:18 +00:00
Russell Keith-Magee 77ab11be45 Refs #2333 - Added 'test' target to django-admin script. Includes addition of --verbosity and --noinput options to django-admin, and a new TEST_RUNNER setting to control the tool used to execute tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-27 12:46:39 +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
Adrian Holovaty 954050c196 Removed bug from [3461] -- __name__ is not assignable 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-28 21:24:19 +00:00
Adrian Holovaty 2a0af00524 Fixed #2375 -- Changed password_reset auth view to make e-mail template name variable. Thanks, treborhudson@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-27 17:48:35 +00:00
Adrian Holovaty c7fa1fa56f Fixed #2388 -- login_required decorator now preserves docstring and name of decorated function. Thanks, derekgr@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-27 17:41:28 +00:00
Adrian Holovaty 564d556519 Fixed #2405 -- Fixed recursion error in auth.views.logout(), caused by [3402]. Thanks, Jay Skabber 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-23 23:14:36 +00:00
Jacob Kaplan-Moss 17d0bd1512 Fixed a bunch of spurious imports, typos, and other small errors turned up by a pass through PyFlakes. This covers about the first third of the errors. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-21 17:11:13 +00:00
Adrian Holovaty c19ef69c5c Fixed #2368 -- Fixed KeyError when trying to log out more than once. Thanks, Gary Wilson 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-20 20:26:10 +00:00
Malcolm Tredinnick c072c8dcd3 Fixed #2377 -- Imported ImproperlyConfigured exception into django.auth.models. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-19 12:48:30 +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 bd13190499 Fixed #2325 -- fix the authentication framework to work with new-style classes. 
Patch from Joseph Kocherhans.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-14 03:09:02 +00:00
Adrian Holovaty f3a586a557 Fixed #2326 -- Fixed exception catching in django.contrib.auth.models. Thanks, mir@noris.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-11 14:03:24 +00:00
Adrian Holovaty 435e8910ae Small edits to comments in contrib/auth/__init__.py 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-03 02:12:59 +00:00
Jacob Kaplan-Moss aab3a418ac Merged multi-auth branch to trunk. See the authentication docs for the ramifications of this change. Many, many thanks to Joseph Kocherhans for the hard work! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-28 16:37:02 +00:00
Adrian Holovaty fb1c01b103 Fixed #1802 -- Fixed database integrity error when creating permission objects after renaming a model 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-20 04:44:27 +00:00
Adrian Holovaty f67b629ada Fixed comma splice in auth.User model docstring 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-20 04:14:10 +00:00
Malcolm Tredinnick b2e5c4ef02 Fixed #1422 -- Docstring improvements for the models in the admin app. Thanks 
akaihola.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-20 04:07:32 +00:00
Adrian Holovaty 551a0272e6 Fixed #2189 -- Optimized auth.User.get_all_permissions() to use select_related behind the scenes to avoid multiple queries. Thanks, konrad@gwu.edu 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-20 03:08:48 +00:00
Malcolm Tredinnick 2da4c4111e Fixed #1856 -- install content-type entries and auth permissions for 
models regardless of the presence of an inner Admin class. Patch from Mathew
Flanagan.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-19 12:50:53 +00:00
Adrian Holovaty 29f55c8dbb Fixed #2106 -- Made collapse-block JavaScript translatable. Thanks, ramiro 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-08 05:04:10 +00:00
Adrian Holovaty 2abfd5dd58 Fixed #2109 -- Convert old-style classes to new-style classes throughout Django. Thanks, Nicola Larosa 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-08 05:00:13 +00:00
Adrian Holovaty 6dfea737f6 Made template names in django.contrib.auth.views passable as template_name argument to the view 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-06 05:16:05 +00:00
Adrian Holovaty 16a07fe95b Fixed #1991 -- Changed AuthenticationForm to disallow users with is_active=False from logging in. Thanks, dave@rightround.com and germish@gmail.com 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-02 04:42:10 +00:00
Adrian Holovaty a2fceea1e3 Changed auth.Permission.__str__() to use str() of self.content_type, not repr() 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-06-01 03:33:34 +00:00
Adrian Holovaty 2f513e0f0e Added support to django/contrib/auth/handlers/modpython.py for setting DJANGO_SETTINGS_MODULE via a PythonOption instead of SetEnv 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-31 02:09:07 +00:00
Adrian Holovaty be57a7fd1a Fixed #849 -- Improved login_required view decorator to save query-string parameters. Also added documentation on the django.contrib.auth.views.login view to docs/authentication.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-22 02:46:55 +00:00
Adrian Holovaty f94f0555bc Fixed #1726 -- Made django/contrib/auth/create_superuser.py a command-line function, and added docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-05 03:08:29 +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
Adrian Holovaty 0c548516bc Fixed #1185 -- Fixed Python 2.4 bug in Django authentication mod_python handler. Thanks, Brian Ray 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-01-08 05:10:51 +00:00
Adrian Holovaty 3cb20c45c7 Moved Apache auth handler to django/contrib/auth/handlers/modpython.py 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-30 01:14:23 +00:00
Adrian Holovaty 5066fe528c Added django.contrib.auth, in preparation for moving stuff to it 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-30 01:09:47 +00:00