Adrian Holovaty
bdcea2e6ca
Fixed #118 -- Renamed 'flat files' to 'flat pages' in the admin. Didn't rename it in the Python code, because too many things would break.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 21:46:40 +00:00
Adrian Holovaty
77d20bedd4
Fixed #192 -- File uploads now work with built-in Web server. Thanks, mordaha@gmail.com
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 21:20:45 +00:00
Adrian Holovaty
46d8bbab3d
Added help_doc to django.core.management.install
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 20:16:15 +00:00
Adrian Holovaty
199938649e
Fixed #81 -- Admin now supports primary_key=True for non-integer fields. Note that you'll have to make a change to your database if you're using a previous Django installation and want to use non-integer primary key fields. See the BackwardsIncompatibleChanges wiki page for info.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 19:32:38 +00:00
Adrian Holovaty
b3ae12fa4a
Cleaned up admin view code to use new 'pk' lookup syntax
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 18:46:11 +00:00
Jacob Kaplan-Moss
8e2d275390
Fixed #241 -- added django.contrib.markup app with markup templatetags for Textile, ReST and Markdown
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 18:31:33 +00:00
Adrian Holovaty
254f31819b
Fixed #299 -- Slugify no longer removes hyphens. Thanks, gch@cs.cmu.edu
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 15:40:14 +00:00
Adrian Holovaty
4622e0ff82
Refactored the way save() works so that non-integer primary keys are now possible. custom_pk unit tests (from [458]) now pass. Refs #81 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 05:08:27 +00:00
Adrian Holovaty
7bac552069
Changed [459] to use a better interface for the exception
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 04:48:47 +00:00
Adrian Holovaty
024e68e260
Changed MySQL backend so that it fails silently if rollback() isn't supported (the code catches NotSupportedError exception)
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 04:45:10 +00:00
Adrian Holovaty
5b812ae02c
Undid [455] -- it's not a good enough solution for what I'm trying to do
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 03:50:46 +00:00
Adrian Holovaty
6d234fae8c
Slightly refactored metasystem -- changed Field pre_save() hooks to pre_save_add(), in preparation for some bigger changes. Refs #81 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 03:44:51 +00:00
Adrian Holovaty
258e6bc330
Simplified metasystem get_db_prep_save() hook so that it doesn't take an 'add' parameter -- it wasn't being used, anyway.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 03:12:37 +00:00
Adrian Holovaty
0d060ba547
Updated PPK's URL in comments of admin_media/js/core.js
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 01:27:13 +00:00
Adrian Holovaty
9a6e8142b8
Removed media.ljworld.com reference from admin_media/js/admin/DateTimeShortcuts.js
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 01:14:50 +00:00
Adrian Holovaty
d8f5cad47e
Removed media.ljworld.com reference from admin_media/js/SelectFilter2.js. Refs #49
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 01:01:54 +00:00
Adrian Holovaty
5144a60efc
Removed unnecessary code from admin_media/js
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 00:44:48 +00:00
Adrian Holovaty
65f7e142e4
Removed admin_media/js/admin/add_calendars.js -- it wasn't being used
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 00:40:08 +00:00
Adrian Holovaty
e2426e68e6
Removed unnecessary code from admin_media/js/admin/add_calendars.js
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 00:37:56 +00:00
Adrian Holovaty
991832d0c4
Fixed #154 -- Fixed constraint error when deleting an object with a many-to-many field
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-10 00:21:41 +00:00
Adrian Holovaty
b888113f49
Small change to docstring in django.core.template
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-09 22:43:34 +00:00
Adrian Holovaty
4f00611f74
Fixed #211 -- edit_inline_type is deprecated, in favor of edit_inline itself. For example, instead of 'edit_inline=True, edit_inline_type=meta.TABULAR', use 'edit_inline=meta.TABULAR'.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-09 21:08:00 +00:00
Adrian Holovaty
b7e226d8b8
Fixed typos in generic-views documentation
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-08 19:45:57 +00:00
Adrian Holovaty
a90e9f43db
Companion checkin to [432]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-08 18:30:07 +00:00
Adrian Holovaty
4003f9f482
Changed 'django-admin adminindex' to output relative links, not absolute links. Thanks, Joe Grace
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-07 01:02:48 +00:00
Adrian Holovaty
5bb56520a5
Fixed #270 -- Admin change forms now display default values in num_extra_on_change fields with default set. Thanks for the patch, Hugo
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-06 20:51:06 +00:00
Adrian Holovaty
8a9806096f
Fixed #7 -- Fixed subtle admin changelist filter bug in maintaining state. Thanks for the patch, Manuzhai!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-06 20:39:43 +00:00
Adrian Holovaty
a537a4efa1
Changed 'django-admin startapp' so that it doesn't create the 'urls' directory. People have said they're a bit overwhelmed by the multiple url directories, and this one isn't necessary for basic Django usage. You can always make it yourself if you know what you're doing and want to decouple/distribute your apps.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 22:43:35 +00:00
Adrian Holovaty
59c3ebc6dd
Greatly improved the 404 error message when DEBUG=True. If none of the urlpatterns matches, Django now displays a list of all the urlpatterns it tried. This should catch a lot of newbie errors, and it's helpful even for power users.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 22:22:41 +00:00
Adrian Holovaty
c517960984
Made small cleanups to two default urlconfs, to be clearer.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 22:15:14 +00:00
Adrian Holovaty
b6a1105768
Updated admin doc view to reflect changes from [411]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 21:24:24 +00:00
Adrian Holovaty
a55598cbdd
Refactored the internals of URL parsing to use less code
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 20:50:19 +00:00
Adrian Holovaty
888cf1f889
Fixed #275 -- Bug in validators.RequiredIfOtherFieldsGiven. Thanks, jhernandez
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 15:41:58 +00:00
Adrian Holovaty
0b9330b085
Changed default ManyToOne num_in_admin from 0 to 3, to help avoid confusion when people forget to set num_in_admin
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-05 15:05:16 +00:00
Adrian Holovaty
502755878d
Fixed #266 -- Added ValidateIfOtherFieldEquals validator. Thanks again, Hugo
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 15:12:11 +00:00
Adrian Holovaty
63eecadfc6
Tightened up some code in django.core.validators
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 15:05:55 +00:00
Adrian Holovaty
0c6019295a
Refactored django.core.validators.RequiredIfOtherFieldGiven to remove duplicate code
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 15:05:15 +00:00
Adrian Holovaty
2315ccc499
Fixed #268 -- Added AnyValidator and fixed small bug in [399]. Thanks, Hugo
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 14:57:20 +00:00
Adrian Holovaty
dae5863058
Fixed #263 -- inspectdb output now includes a comment reminding people to run sqlinitialdata. Thanks, Hugo
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 14:51:46 +00:00
Adrian Holovaty
a8ecb56106
Fixed #267 -- "Save and continue editing" no longer assumes object has an ID field. Thanks, Hugo
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 14:48:48 +00:00
Adrian Holovaty
3f2df5e7aa
Fixed #269 -- Added MatchesRegularExpression validator. Thanks, Hugo!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 14:42:01 +00:00
Adrian Holovaty
cfbf261709
Improved 'django-admin inspectdb' so that it doesn't raise an exception for unknown field types. Now it uses TextField by default and outputs a Python comment.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 03:49:24 +00:00
Adrian Holovaty
808e50986b
Fixed #257 -- Empty model modules no longer cause an error. Thanks, Bill de hÓra
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-04 03:32:56 +00:00
Adrian Holovaty
f4e4ae96cb
Improved 'django-admin inspectdb' so that it detects ForeignKey relationships -- PostgreSQL only
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 22:33:39 +00:00
Jacob Kaplan-Moss
49c6708716
Added doc view for templates that will show the search path for a given template on each site
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 20:29:27 +00:00
Jacob Kaplan-Moss
ce0d0cd9e2
Made a bunch of fixes to auto-generated admin documentation:
...
* Views are no longer "doubled"
* Links work better (view -> model links and friends were broken)
* Performance has been improved so now the pages no longer need to be cached.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 19:59:51 +00:00
Jacob Kaplan-Moss
ffc3edd79e
Fixed a subtle bug with the {% load %} tag: if a tag/filter was removed from template.registered_tags/filters, {% load %} would fail (since module-level code is only run on an initial import). {% load %} now reloads the module, which makes sure that the tag always works even when someone's been doing something screwy. This fixes #242 (and wouldn't had been found without it, so much thanks).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 18:47:46 +00:00
Adrian Holovaty
51aba5deaf
Removed redundant verbose names from auth and core models, because they're no longer required
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 17:56:22 +00:00
Jacob Kaplan-Moss
623863d0a4
Fixed #105 -- collapsable fieldsets now work in both ways (thanks, Simon)
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 17:49:49 +00:00
Adrian Holovaty
b3b27d2593
Removed id field from auth.Message model -- it's implied
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 17:48:33 +00:00
Jacob Kaplan-Moss
2e83364965
Calendar next/prev popups now work in Safari ( fixed #2 )
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 17:45:53 +00:00
Adrian Holovaty
d9401b78f1
Added first stab at 'django-admin.py inspectdb', which takes a database name and introspects the tables, outputting a Django model. Works in PostgreSQL and MySQL. It's missing some niceties at the moment, such as detection of primary-keys and relationships, but it works. Refs #90 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-02 17:08:24 +00:00
Jacob Kaplan-Moss
1510ca1a80
Fixed #227 -- the sqlite backend now correctly typecasts unicode objects to bytestrings (thanks hugo)
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 21:49:57 +00:00
Adrian Holovaty
e0c3dd3318
Refactored meta.py -- created a django.core.meta package, with init.py and fields.py
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 21:29:52 +00:00
Adrian Holovaty
006e9e789b
Fixed #180 -- Removed 'enctype' from FREE_COMMENT_FORM template in contrib.comments.templatetags
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 20:07:31 +00:00
Adrian Holovaty
77faac0cb7
Changed SEND_BROKEN_LINK_EMAILS from True to False in global_settings -- it was causing too much confusion with improperly configured/missing mail servers
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 20:01:18 +00:00
Jacob Kaplan-Moss
440a2a97e9
Added framework for writing non-model-based tests, and added tests for cache and templates
...
from the old django/tests location (which has been removed).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 19:09:07 +00:00
Adrian Holovaty
b307fb09bb
Fixed #239 and #107 -- Changed model init() to use Field.get_default() if the value wasn't explicitly passed as a keyword argument. That means setting 'id=None' is no longer necessary, and you can leave off fields if you want them to have default values set.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 16:26:39 +00:00
Adrian Holovaty
1a8fc57bf6
Fixed #214 -- Added get_values() and get_values_iterator() module-level functions to DB API. Thanks, rmunn
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 15:32:42 +00:00
Jacob Kaplan-Moss
af95567c14
Improved error message in urlresolvers ( fixes #240 )
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-08-01 14:41:01 +00:00
Adrian Holovaty
8b36eb11d3
Gave comments.FreeComment a get_absolute_url() method
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-30 18:56:36 +00:00
Adrian Holovaty
47ce61533a
Fixed #228 -- Better handling of timezones. Thanks, rmunn
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-29 21:40:09 +00:00
Adrian Holovaty
017b8753a6
Fixed #219 and #188 -- Database timestamp typecast no longer assumes '-' delineates the time zone
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-29 21:10:09 +00:00
Adrian Holovaty
9e64035796
Changed admin views to output utf-8 charset explicitly
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-29 16:32:47 +00:00
Adrian Holovaty
d4a9a4f83a
Fixed #223 -- Changed breadcrumbs in admin doc templates to use relative, not absolute, URLs. Thanks, Drew Amato
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-29 15:25:31 +00:00
Adrian Holovaty
cf9efea240
Whoop, left in an 'assert False' in [333]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-28 15:01:10 +00:00
Adrian Holovaty
f5b605ab1b
Fixed #218 -- Fixed admin change-list column sorting
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-28 14:59:50 +00:00
Adrian Holovaty
1d2ab36068
Fixed bug for models with a ForeignKey('self') and order_with_respect_to
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-27 19:20:29 +00:00
Adrian Holovaty
9b98383175
Fixed #187 -- Made admin view handle one-to-one relationships in which the parent relationship doesn't have the 'admin' parameter set. Thanks, Moof
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 23:24:55 +00:00
Adrian Holovaty
d52db2d879
Changed django.core.management.get_sql_delete to be more robust when many-to-many tables don't exist
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 23:18:08 +00:00
Adrian Holovaty
d8ef66b17d
Fixed #186 -- Refactored meta.py to remove duplicate code between function_get_list and function_get_iterator. Thanks, rmunn@pobox.com
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 23:04:50 +00:00
Adrian Holovaty
18e420da02
Added breadcrumbs to password-reset and password-change admin templates
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:54:59 +00:00
Adrian Holovaty
6a12d65b97
Changed admin logged_out template NOT to hard-code /admin/ as the 'Home'. Refs #158
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:52:18 +00:00
Adrian Holovaty
fe91881e35
Fixed #159 -- Admin users no longer have to log in to go to the 'log out' page. Thanks, Manuzhai
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:48:04 +00:00
Adrian Holovaty
3c0c0e7317
Fixed #162 -- Admin log now records repr() before calling delete(), instead of after calling it() -- thanks, mfenniak@pobox.com!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:43:27 +00:00
Adrian Holovaty
b23c63bcfe
Fixed #206 -- 'django-admin sqlclear' now deletes from admin log to prevent referential integrity violations
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:38:54 +00:00
Adrian Holovaty
aeff2cb530
Fixed #93 -- Fixed 'django-admin startproject' to use os.path.join instead of string concatenation
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 22:15:51 +00:00
Adrian Holovaty
5a3da949fa
Fixed #198 -- istartswith and iendswith weren't working properly. Thanks, brantley
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 18:38:44 +00:00
Adrian Holovaty
8a86e7713f
Fixed #161 -- Log output for 'django-admin runserver' no longer includes admin media
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 17:49:49 +00:00
Adrian Holovaty
ba3db4ca38
Removed Adrian's note in the docstring of django.utils.feedgenerator -- it's part of Django now
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 17:42:37 +00:00
Adrian Holovaty
284948b9cf
Fixed #166 -- Added an 'in' lookup type to the database API
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 16:53:58 +00:00
Adrian Holovaty
786c750c40
Fixed #163 -- Added 'pk' database API option, which is a shorthand for (primary_key)__exact
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 16:11:43 +00:00
Adrian Holovaty
e207378ad3
Fixed #204 -- Changed 'django-admin createsuperuser' to disallow blank passwords
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 14:37:00 +00:00
Jacob Kaplan-Moss
1484f2e225
Fixed #207 -- thanks, Mathieu.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 14:26:15 +00:00
Adrian Holovaty
7d574e8f76
Removed 'use_numeric_months' parameter in generic date views (from [308]) in favor of something more powerful -- you can now provide month_format and day_format, which are format strings that specify how you expect the month and day to be formatted in the URL.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-26 03:48:41 +00:00
Jacob Kaplan-Moss
48441f467f
Fixed #193 -- thanks (again), steadicat
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-25 22:17:47 +00:00
Jacob Kaplan-Moss
a6ed088c62
Fixed #194 -- thanks, steadicat!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-25 22:16:30 +00:00
Jacob Kaplan-Moss
12ffae6df4
Fixed #197 -- thanks for finding that, mmarshall
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-25 22:15:07 +00:00
Jacob Kaplan-Moss
5498dbe519
Fixed #196 : date-based generic views now have a "use_numeric_months" option if you'd like to use numeric months in the urls. Also fixed #183 while I was at it.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-25 22:07:04 +00:00
Jacob Kaplan-Moss
6c43b0e06c
Fixed #195 : generic views now allow callables in extra_context dicts -- thanks, Moof!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-25 21:53:00 +00:00
Jacob Kaplan-Moss
371144f134
A bunch of generics: documentation of generic views; cleaned up existing generic views, and added create/update generic views.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-24 22:21:09 +00:00
Adrian Holovaty
768c17eda0
Fixed #168 -- admin object history was assuming primary key was named 'id'. Thanks, clintecker@gmail.com
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-23 15:49:26 +00:00
Jacob Kaplan-Moss
0bbe1f4425
DateTimeShortcuts.js now calls the right dismiss function; thanks jhernandez
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 21:56:50 +00:00
Adrian Holovaty
c97efb6799
Fixed #63 -- Refactored django.core.handlers into subclasses to remove duplicate code
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 18:34:38 +00:00
Adrian Holovaty
d573cb021e
Fixed #112 -- WSGI handler now displays proper text status. Thanks, sune.kirkeby@gmail.com!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 18:12:05 +00:00
Adrian Holovaty
79026a6e22
Fixed #156 -- Fixed admin changelist bug as a result of ordering syntax change
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 17:58:56 +00:00
Wilson Miner
f1f952761e
Uncommented link to Change password now that it works
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 16:40:36 +00:00
Wilson Miner
8ef422d070
Added password reset templates to admin_templates
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 15:02:40 +00:00
Adrian Holovaty
837a64565b
Django now outputs a warning if you use old ordering syntax
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 13:03:50 +00:00
Adrian Holovaty
8b3c05afa5
Fixed #146 -- Changed order_by and ordering parameters to be less verbose. The old syntax is still supported but will not be supported by first release.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 13:02:27 +00:00
Adrian Holovaty
05bdb8d64b
Fixed a legacy ordering_tuple --> order_by renaming in core.paginator
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 05:11:37 +00:00
Adrian Holovaty
2d3def9fa2
Tiny code compression in django.views.admin.main
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 04:40:37 +00:00
Adrian Holovaty
a1f479e080
Fixed #147 -- Thanks, Robin Munn!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 04:18:03 +00:00
Jacob Kaplan-Moss
e320a0936e
Added sqlite3 database backend -- somewhat tested, but probably not 100% perfect.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 03:15:43 +00:00
Adrian Holovaty
dbfb35b542
Fixed #145 -- Changed admin logout to use views.auth.login.logout, which uses redirects to ensure cookies aren't stale. Thanks, sdelatorre@gmail.com
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-22 00:49:53 +00:00
Jacob Kaplan-Moss
78cff1837a
Refactor dictfetch* methods from mysql backend out into a seperate module; this is so that future db backends that need these functions can share them.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 15:48:20 +00:00
Adrian Holovaty
841b426243
Cleaned up [269] a tiny bit
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 15:01:31 +00:00
Jacob Kaplan-Moss
ccffb19946
Fixed #132 -- thanks anonymous user
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 14:01:17 +00:00
Jacob Kaplan-Moss
907ae72e81
fixes #133 -- thanks Joeri
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 13:57:42 +00:00
Jacob Kaplan-Moss
6b514f1aab
Fixed #137 -- thanks nesh@studioquattro.co.yu
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 13:53:33 +00:00
Adrian Holovaty
e1d21e5bcf
Added copyright notice to utils/autoreload for CherryPy folks
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 04:10:47 +00:00
Adrian Holovaty
9566a61a22
Added auto-reload to standalone server! Fixes #113 . Thanks very much to Jason Huggins for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 04:08:54 +00:00
Adrian Holovaty
c21f6ecee2
Fixed #92 -- meta.Admin 'fields' parameter is now optional. If it's not given, Django will use all editable fields by default. This cuts down on redundancy. Also updated relevant docs to reflect the change.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 03:46:16 +00:00
Adrian Holovaty
304b08e325
Improved 'django-admin runserver' so that it explicitly tells you how to stop it. Also trapped KeyboardInterrupt so stopping it doesn't give an ugly traceback.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 03:24:28 +00:00
Adrian Holovaty
03c436bf61
Refactored django.views.admin.main to call opts.admin.get_field_objs() only once, and made sure no code accessed admin.fields directly, in preparation for an upcoming change
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 03:19:30 +00:00
Adrian Holovaty
8d144dadd8
Fixed #114 -- Changed uses of deprecated 'whrandom' module to 'random'
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 02:20:40 +00:00
Adrian Holovaty
d330be0169
Added 'django-admin createsuperuser' and updated tutorial to use it instead of manually creating the user in the Python interactive prompt
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-21 02:17:45 +00:00
Adrian Holovaty
bc5359f754
Added optional rel_name parameter to ManyToManyField, which makes it possible to many-to-many-relate a single model to another model more than once. Also updated the model docs to reflect this
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 22:55:01 +00:00
Adrian Holovaty
895d232671
Small code cleanup -- changed django.core.management.get_sql_delete to use get_m2m_db_table(), and moved get_m2m_db_table() from Field to ManyToManyField, because it's only used by the latter
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 21:56:12 +00:00
Adrian Holovaty
47cc60d94b
Fixed small bug in print_error() calls in django-admin
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 20:35:53 +00:00
Adrian Holovaty
ec31445c52
Added '--settings' option to django-admin. This specifies which settings module to use, if you don't want to deal with setting the DJANGO_SETTINGS_MODULE environment variable. Refactored django-admin to use optparse. Updated the tutorials to use '--settings' instead of environment variables, which can be confusing.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 17:42:36 +00:00
Jacob Kaplan-Moss
1b8c4c4556
Argh: fixed another bug in [244]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 17:12:12 +00:00
Jacob Kaplan-Moss
067f56d93d
Fixed really dumb bug in [244]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 17:09:39 +00:00
Jacob Kaplan-Moss
890bd5b0d2
Added "reversed" option to get_comment_list templatetag to return comments in most-recent-first order.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 17:07:30 +00:00
Adrian Holovaty
1fc28dea11
Fixed #97 -- Refactored django-admin.py so that it only contains command-line-interface code. Moved the actual meat into django/core/management.py
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 15:00:34 +00:00
Adrian Holovaty
e215ed3609
Fixed #102 -- Now using text/plain mimetype for exceptions displayed in the browser, so angle brackets are no longer an issue
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 06:13:06 +00:00
Adrian Holovaty
2012f7df63
'django-admin runserver' now displays the settings module you're using when it starts up
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 06:08:39 +00:00
Adrian Holovaty
45c334dd8b
Cleaned up code in django.conf.settings to move DJANGO_SETTINGS_MODULE into a variable, so other scripts can introspect it. Also made it display a better error message if DJANGO_SETTINGS_MODULE is set to the empty string
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 06:05:32 +00:00
Adrian Holovaty
584cab7bc5
Fixed ForeignKey('self') so that extra cruft parameters aren't necessary. Also refactored the way meta.Admin is handled, so that fields aren't initialized until you manually call meta.Admin.get_field_objs()
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 05:46:00 +00:00
Adrian Holovaty
526f6af782
Changed models.auth.Session.get_session_from_cookie to raise SessionDoesNotExist instead of SuspiciousOperation if tamper check fails
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 00:57:38 +00:00
Adrian Holovaty
d384870307
Changed django.views.defaults to use template.Context instead of core.extensions.DjangoContext
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 00:50:37 +00:00
Adrian Holovaty
20820f2e85
Made ModPythonHandler.get_response() tolerant of repr(request) that has an exception
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 00:47:10 +00:00
Adrian Holovaty
49fbe711cc
Added missing import to [230]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 00:43:39 +00:00
Adrian Holovaty
897d24b220
Fixed #95 -- Added SECRET_KEY setting instead of hard-coding keys that are shared for every Django installation. 'django-admin.py startproject' now creates a random SECRET_KEY. The auth and comments modules, and the admin middleware, all use SECRET_KEY now, instead of hard-coded values.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-20 00:37:45 +00:00
Adrian Holovaty
43538e78eb
Fixed #59 -- Changed hard-coded references to password_change and logout in admin templates to add /admin/ prefix. Still hard-coded, but you can override it in custom templates if your URL structure is different
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 21:39:52 +00:00
Adrian Holovaty
3fc5294d2e
Fixed #84 -- CREATE TABLE foreign keys now work in MySQL
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 21:32:58 +00:00
Adrian Holovaty
307f3a95c7
Fixed the annoying login error that happens in some cases when REGISTRATION_COOKIE_DOMAIN isn't set. Now, generally you don't have to sete REGISTRATION_COOKIE_DOMAIN unless you want to use multi-domain cookies (such as '.foo.com')
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 19:13:33 +00:00
Adrian Holovaty
5874952a8e
Improved error message when DATABASE_ENGINE is invalid. It now displays a list of all available database backends
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 19:04:12 +00:00
Adrian Holovaty
e29afe7974
Fixed #88 -- settings are now forgiving of single-element INSTALLED_APPS and TEMPLATE_DIRS without trailing commas.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 17:58:01 +00:00
Adrian Holovaty
df66763406
Fixed #67 -- Human-readable name is now optional in model fields. If a second positional argument isn't given, Django will use the first argument, converting underscores to spaces. This change is fully backwards-compatible.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 17:20:37 +00:00
Adrian Holovaty
3e09a1fc1c
Quick bugfix to [207] -- MySQL doesn't have ILIKE
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 15:24:27 +00:00
Adrian Holovaty
5797066383
Added support for istartswith and iendswith in database API
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 15:24:03 +00:00
Adrian Holovaty
b430d4c54f
Improved error message in urlresolvers.RegexURLResolver.resolve to use repr instead of str on app_path
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 14:47:41 +00:00
Adrian Holovaty
7fa76265ad
Fixed #83 -- Fixed spelling error in django.conf.settings. Nice catch, Manuzhai!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 14:44:27 +00:00
Adrian Holovaty
fc85642ed5
Added a more helpful error message to django.core.urlresolvers.RegexURLResolver.resolve
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 05:45:31 +00:00
Adrian Holovaty
7d553c0650
Improved TemplateDoesNotExist error message in django.core.template_file
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 04:40:57 +00:00
Adrian Holovaty
3ab5791383
Improved ViewDoesNotExist error messages in django.core.urlresolvers
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 04:30:23 +00:00
Adrian Holovaty
8f4fa5a4e7
Fixed #69 -- Implemented dictfetchone(), dictfetchmany() and dictfetchall() for mysql DB backend. Thanks, Manuzhai!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-19 02:13:20 +00:00
Adrian Holovaty
62cc287b2b
Fixed #76 -- development server now serves images, too, at whatever relative URL is provided by ADMIN_MEDIA_PREFIX
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 22:49:04 +00:00
Adrian Holovaty
a7506973af
Moved default admin from media to django/conf/admin_media, so Django is able to introspect their location, in preparation for #76
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-07-18 22:35:04 +00:00