Django

Code

Show
Ignore:
Timestamp:
07/01/08 10:49:08 (6 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7814].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7808 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7814

  • django/branches/newforms-admin/django/conf/global_settings.py

    r7707 r7815  
    232232MEDIA_URL = '' 
    233233 
     234# List of upload handler classes to be applied in order. 
     235FILE_UPLOAD_HANDLERS = ( 
     236    'django.core.files.uploadhandler.MemoryFileUploadHandler', 
     237    'django.core.files.uploadhandler.TemporaryFileUploadHandler', 
     238) 
     239 
     240# Maximum size, in bytes, of a request before it will be streamed to the 
     241# file system instead of into memory. 
     242FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440 # i.e. 2.5 MB 
     243 
     244# Directory in which upload streamed files will be temporarily saved. A value of 
     245# `None` will make Django use the operating system's default temporary directory 
     246# (i.e. "/tmp" on *nix systems). 
     247FILE_UPLOAD_TEMP_DIR = None 
     248 
    234249# Default formatting for date objects. See all available format strings here: 
    235250# http://www.djangoproject.com/documentation/templates/#now