Django

Code

Changeset 7354

Show
Ignore:
Timestamp:
03/23/08 12:18:58 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7280-7353 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7278 to /django/trunk:1-7353

  • django/branches/gis/AUTHORS

    • Property svn:eol-style set to native
    r7279 r7354  
    6060    David Avsajanishvili <avsd05@gmail.com> 
    6161    axiak@mit.edu 
     62    Niran Babalola <niran@niran.org> 
    6263    Morten Bagai <m@bagai.com> 
    6364    Mikaël Barbero <mikael.barbero nospam at nospam free.fr> 
    …… 
    146147    gandalf@owca.info 
    147148    Marc Garcia <marc.garcia@accopensys.com> 
     149    Alex Gaynor <alex.gaynor@gmail.com> 
    148150    Andy Gayton <andy-django@thecablelounge.com> 
    149151    Baishampayan Ghose 
    …… 
    244246    michal@plovarna.cz 
    245247    Mikko Hellsing <mikko@sorl.net> 
     248    Daniel Lindsley <polarcowz@gmail.com> 
    246249    Orestis Markou <orestis@orestis.gr> 
    247250    Slawek Mikula <slawek dot mikula at gmail dot com> 
    …… 
    257260    Robert Myers <myer0052@gmail.com> 
    258261    Nebojša Dorđević 
     262    Doug Napoleone <doug@dougma.com> 
    259263    Gopal Narayanan <gopastro@gmail.com> 
    260264    Fraser Nevett <mail@nevett.org> 
    …… 
    270274    permonik@mesias.brnonet.cz 
    271275    petr.marhoun@gmail.com 
     276    peter@mymart.com 
    272277    pgross@thoughtworks.com 
    273278    phaedo <http://phaedo.cx/> 
    …… 
    308313    John Shaffer <jshaffer2112@gmail.com> 
    309314    Pete Shinners <pete@shinners.org> 
     315    Leo Shklovskii 
    310316    jason.sidabras@gmail.com 
    311317    Jozko Skrablin <jozko.skrablin@gmail.com> 

  • django/branches/gis/django/conf/global_settings.py

    r7279 r7354  
    288288SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether sessions expire when a user closes his browser. 
    289289SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data 
    290 SESSION_FILE_PATH = '/tmp/'                             # Directory to store session files if using the file session module 
     290SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If set to None the backend will use a sensible default. 
    291291 
    292292######### 

  • django/branches/gis/django/conf/locale/de/LC_MESSAGES/django.po

    r7279 r7354  
    88"Project-Id-Version: Django\n" 
    99"Report-Msgid-Bugs-To: \n" 
    10 "POT-Creation-Date: 2008-03-03 15:46+0100\n" 
     10"POT-Creation-Date: 2008-03-18 15:10-0500\n" 
    1111"PO-Revision-Date: 2008-03-03 16:10+0100\n" 
    12 "Last-Translator: Michael Radziej <mir@noris.de>\n" 
     12"Last-Translator: Jannis Leidel <jannis@leidel.info>\n" 
    1313"Language-Team: \n" 
    1414"MIME-Version: 1.0\n" 
    …… 
    1919"X-Poedit-SourceCharset: utf-8\n" 
    2020"Plural-Forms: nplurals=2; plural=(n != 1)\n" 
    21 "X-Generator: KBabel 1.11.4\n" 
    2221