Django

Code

Changeset 8215

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (4 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/AUTHORS

    r7979 r8215  
    4242answer newbie questions, and generally made Django that much better: 
    4343 
     44    ajs <adi@sieker.info> 
    4445    alang@bright-green.com 
    4546    Marty Alchin <gulopine@gamemusic.org> 
    …… 
    7172    Chris Bennett <chrisrbennett@yahoo.com> 
    7273    James Bennett 
    73     Ben Godfrey <http://aftnn.org> 
     74    Julian Bez 
    7475    Arvis Bickovskis <viestards.lists@gmail.com> 
    7576    Paul Bissex <http://e-scribe.com/> 
    …… 
    151152    Afonso Fernández Nogueira <fonzzo.django@gmail.com> 
    152153    J. Pablo Fernandez <pupeno@pupeno.com> 
     154    Maciej Fijalkowski 
    153155    Matthew Flanagan <http://wadofstuff.blogspot.com> 
    154156    Eric Floehr <eric@intellovations.com> 
     157    Eric Florenzano <floguy@gmail.com> 
    155158    Vincent Foley <vfoleybourgon@yahoo.ca> 
    156159    Rudolph Froger <rfroger@estrate.nl> 
    …… 
    165168    martin.glueck@gmail.com 
    166169    Artyom Gnilov <boobsd@gmail.com> 
     170    Ben Godfrey <http://aftnn.org> 
    167171    GomoX <gomo@datafull.com> 
    168172    Guilherme Mesquita Gondim <semente@taurinus.org> 
    …… 
    173177    Espen Grindhaug <http://grindhaug.org/> 
    174178    Thomas Güttler <hv@tbz-pariv.de> 
     179    Horst Gutmann <zerok@zerokspot.com> 
    175180    dAniel hAhler 
    176181    hambaloney 
    …… 
    235240    Paul Lanier <planier@google.com> 
    236241    Nicola Larosa <nico@teknico.net> 
     242    Lau Bech Lauritzen 
    237243    Rune Rønde Laursen <runerl@skjoldhoej.dk> 
    238244    Eugene Lazutkin <http://lazutkin.com/blog/> 
    …… 
    277283    mrmachine <real.human@mrmachine.net> 
    278284    Robin Munn <http://www.geekforgod.com/> 
     285    James Murty 
    279286    msundstr 
    280287    Robert Myers <myer0052@gmail.com> 
    …… 
    302309    phil.h.smith@gmail.com 
    303310    Gustavo Picon 
     311    Michael Placentra II <someone@michaelplacentra2.net> 
    304312    Luke Plant <http://lukeplant.me.uk/> 
    305313    plisk 
    …… 
    339347    Leo Shklovskii 
    340348    jason.sidabras@gmail.com 
     349    Brenton Simpson <http://theillustratedlife.com> 
    341350    Jozko Skrablin <jozko.skrablin@gmail.com> 
    342351    Ben Slavin <benjamin.slavin@gmail.com> 
     352    sloonz <simon.lipp@insa-lyon.fr> 
    343353    SmileyChris <smileychris@gmail.com> 
    344354    smurf@smurf.noris.de 
    …… 
    399409    Rachel Willmer <http://www.willmer.com/kb/> 
    400410    Gary Wilson <gary.wilson@gmail.com> 
     411    Jakub Wilk <ubanus@users.sf.net> 
    401412    Jakub Wiśniowski <restless.being@gmail.com> 
    402413    Maciej Wiśniowski <pigletto@gmail.com> 

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

    r7836 r8215  
    189189PREPEND_WWW = False 
    190190 
     191# Override the server-derived value of SCRIPT_NAME 
     192FORCE_SCRIPT_NAME = None 
     193 
    191194# List of compiled regular expression objects representing User-Agent strings 
    192195# that are not allowed to visit any page, systemwide. Use this for bad 
    …… 
    364367LOGIN_REDIRECT_URL = '/accounts/profile/' 
    365368 
     369# The number of days a password reset link is valid for 
     370PASSWORD_RESET_TIMEOUT_DAYS = 3 
     371 
    366372########### 
    367373# TESTING # 

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

    r7768 r8215  
    88"Project-Id-Version: Django\n" 
    99"Report-Msgid-Bugs-To: \n" 
    10 "POT-Creation-Date: 2008-06-23 20:23+0200\n" 
    11 "PO-Revision-Date: 2008-06-23 20:51+0100\n" 
     10"POT-Creation-Date: 2008-08-01 11:38+0200\n" 
     11"PO-Revision-Date: 2008-08-01 12:42+0100\n" 
    1212"Last-Translator: Jannis Leidel <jannis@leidel.info>\n" 
    1313"Language-Team: \n" 
    …… 
    253253 
    254254#: contrib/admin/filterspecs.py:147 
    255 #: newforms/widgets.py:231 
     255#: forms/widgets.py:379 
    256256#: oldforms/__init__.py:592 
    257257msgid "Yes" 
    …… 
    259259 
    260260#: contrib/admin/filterspecs.py:147 
    261 #: newforms/widgets.py:231 
     261#: forms/widgets.py:379 
    262262#: oldforms/__init__.py:592 
    263263msgid "No" 
    …… 
    265265 
    266266#: contrib/admin/filterspecs.py:154 
    267 #: newforms/widgets.py:231 
     267#: forms/widgets.py:379 
    268268#: oldforms/__init__.py:592 
    269269msgid "Unknown" 
    270270msgstr "Unbekannt" 
    271271 
    272 #: contrib/admin/models.py:18 
     272#: contrib/admin/models.py:19 
    273273msgid "action time" 
    274274msgstr "Zeitpunkt der Aktion" 
    275275 
    276 #: contrib/admin/models.py:21 
     276