Commit 7f3678dc authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge branch 'master' into schema-alteration 

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py
parents b62e8236 93c1576f

.tx/config

+0 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po 
source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po

source_lang = en



[django.contrib-localflavor]

file_filter = django/contrib/localflavor/locale/<lang>/LC_MESSAGES/django.po

source_file = django/contrib/localflavor/locale/en/LC_MESSAGES/django.po

source_lang = en



[django.contrib-messages]

file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po

source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po

AUTHORS

+22 −2
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ The PRIMARY AUTHORS are (and/or have been): 
    * Jeremy Dunck

    * Bryan Veloso

    * Preston Holmes

    * Simon Charette

    * Donald Stufft



More information on the main contributors to Django can be found in

docs/internals/committers.txt.
@@ -97,7 +99,9 @@ answer newbie questions, and generally made Django that much better: 
    Natalia Bidart <nataliabidart@gmail.com>

    Mark Biggers <biggers@utsl.com>

    Paul Bissex <http://e-scribe.com/>

    Loïc Bistuer <loic.bistuer@sixmedia.com>

    Simon Blanchard

    Craig Blaszczyk <masterjakul@gmail.com>

    David Blewett <david@dawninglight.net>

    Matt Boersma <matt@sprout.org>

    Artem Gnilov <boobsd@gmail.com>
@@ -140,7 +144,10 @@ answer newbie questions, and generally made Django that much better: 
    colin@owlfish.com

    crankycoder@gmail.com

    Paul Collier <paul@paul-collier.com>

    Paul Collins <paul.collins.iii@gmail.com>

    Robert Coup

    Deric Crago <deric.crago@gmail.com>

    David Cramer <dcramer@gmail.com>

    Pete Crosier <pete.crosier@gmail.com>

    Matt Croydon <http://www.postneo.com/>

    Jure Cuhalev <gandalf@owca.info>
@@ -162,6 +169,7 @@ answer newbie questions, and generally made Django that much better: 
    Matt Dennenbaum

    deric@monowerks.com

    Max Derkachev <mderk@yandex.ru>

    Carlos Matías de la Torre <cmdelatorre@gmail.com>

    Rajesh Dhawan <rajesh.dhawan@gmail.com>

    Sander Dijkhuis <sander.dijkhuis@gmail.com>

    Jordan Dimov <s3x3y1@gmail.com>
@@ -202,6 +210,7 @@ answer newbie questions, and generally made Django that much better: 
    Stefane Fermgier <sf@fermigier.com>

    J. Pablo Fernandez <pupeno@pupeno.com>

    Maciej Fijalkowski

    Juan Pedro Fisanotti <fisadev@gmail.com>

    Ben Firshman <ben@firshman.co.uk>

    Matthew Flanagan <http://wadofstuff.blogspot.com>

    Eric Floehr <eric@intellovations.com>
@@ -303,6 +312,7 @@ answer newbie questions, and generally made Django that much better: 
    Garth Kidd <http://www.deadlybloodyserious.com/>

    kilian <kilian.cavalotti@lip6.fr>

    Sune Kirkeby <http://ibofobi.dk/>

    Hiroki Kiyohara <hirokiky@gmail.com>

    Bastian Kleineidam <calvin@debian.org>

    Cameron Knight (ckknight)

    Nena Kojadin <nena@kiberpipa.org>
@@ -324,6 +334,7 @@ answer newbie questions, and generally made Django that much better: 
    Denis Kuzmichyov <kuzmichyov@gmail.com>

    Panos Laganakos <panos.laganakos@gmail.com>

    Nick Lane <nick.lane.au@gmail.com>

    Łukasz Langa <lukasz@langa.pl>

    Stuart Langridge <http://www.kryogenix.org/>

    Paul Lanier <planier@google.com>

    David Larlet <http://david.larlet.fr>
@@ -358,6 +369,7 @@ answer newbie questions, and generally made Django that much better: 
    Mike Malone <mjmalone@gmail.com>

    Martin Maney <http://www.chipy.org/Martin_Maney>

    Michael Manfre <mmanfre@gmail.com>

    Javier Mansilla <javimansilla@gmail.com>

    masonsimon+django@gmail.com

    Manuzhai

    Petr Marhoun <petr.marhoun@gmail.com>
@@ -378,6 +390,7 @@ answer newbie questions, and generally made Django that much better: 
    Paul McLanahan <paul@mclanahan.net>

    Tobias McNulty <http://www.caktusgroup.com/blog>

    Andrews Medina <andrewsmedina@gmail.com>

    Christoph Mędrela <chris.medrela@gmail.com>

    Zain Memon

    Christian Metts

    michal@plovarna.cz
@@ -414,6 +427,7 @@ answer newbie questions, and generally made Django that much better: 
    Christian Oudard <christian.oudard@gmail.com>

    oggie rob <oz.robharvey@gmail.com>

    oggy <ognjen.maric@gmail.com>

    Tomek Paczkowski <tomek@hauru.eu>

    Jens Page

    Jay Parlar <parlar@gmail.com>

    Carlos Eduardo de Paula <carlosedp@gmail.com>
@@ -423,6 +437,7 @@ answer newbie questions, and generally made Django that much better: 
    Andreas Pelme <andreas@pelme.se>

    permonik@mesias.brnonet.cz

    peter@mymart.com

    Christophe Pettus <xof@thebuild.com>

    pgross@thoughtworks.com

    phaedo <http://phaedo.cx/>

    phil@produxion.net
@@ -461,6 +476,7 @@ answer newbie questions, and generally made Django that much better: 
    Mike Richardson

    Matt Riggott

    Alex Robbins <alexander.j.robbins@gmail.com>

    Matt Robenolt <m@robenolt.com>

    Henrique Romano <onaiort@gmail.com>

    Armin Ronacher

    Daniel Roseman <http://roseman.org.uk/>
@@ -513,6 +529,7 @@ answer newbie questions, and generally made Django that much better: 
    Johan C. Stöver <johan@nilling.nl>

    Nowell Strite <http://nowell.strite.org/>

    Thomas Stromberg <tstromberg@google.com>

    Hannes Struß <x@hannesstruss.de>

    Ben Sturmfels <ben@sturm.com.au>

    Travis Swicegood <travis@domain51.com>

    Pascal Varet
@@ -541,6 +558,7 @@ answer newbie questions, and generally made Django that much better: 
    Tom Tobin

    Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>

    torne-django@wolfpuppy.org.uk

    Matthew Tretter <m@tthewwithanm.com>

    Jeff Triplett <jeff.triplett@gmail.com>

    tstromberg@google.com

    Makoto Tsuyuki <mtsuyuki@gmail.com>
@@ -585,12 +603,13 @@ answer newbie questions, and generally made Django that much better: 
    ye7cakf02@sneakemail.com

    ymasuda@ethercube.com

    Jesse Young <adunar@gmail.com>

    Marc Aymerich Gubern

    Wiktor Kołodziej <wiktor@pykonik.org>

    Mykola Zamkovoi <nickzam@gmail.com>

    zegor

    Gasper Zejn <zejn@kiberpipa.org>

    Jarek Zgoda <jarek.zgoda@gmail.com>

    Cheng Zhang

    Hannes Struß <x@hannesstruss.de>



A big THANK YOU goes to:
@@ -601,6 +620,7 @@ A big THANK YOU goes to: 


    Ian Bicking for convincing Adrian to ditch code generation.



    Mark Pilgrim for diveintopython.org. (RIP!)

    Mark Pilgrim for "Dive Into Python" (http://diveintopython.net,

    http://www.diveintopython3.net).



    Guido van Rossum for creating Python.

CONTRIBUTING.rst

+9 −0
Original line number Diff line number Diff line
@@ -14,3 +14,12 @@ Extensive contribution guidelines are available in the repository at 
``docs/internals/contributing/``, or online at:



https://docs.djangoproject.com/en/dev/internals/contributing/



**Warning: pull requests are ignored!** `File a ticket`__ to suggest changes.



__ https://code.djangoproject.com/newticket



Django uses Trac to keep track of bugs, feature requests, and associated

patches because GitHub doesn't provide adequate tooling for its community.

Patches can be submitted as pull requests, but if you don't file a ticket,

it's unlikely that we'll notice your contribution.

MANIFEST.in

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ recursive-include django/contrib/auth/fixtures * 
recursive-include django/contrib/auth/templates *

recursive-include django/contrib/auth/tests/templates *

recursive-include django/contrib/comments/templates *

recursive-include django/contrib/databrowse/templates *

recursive-include django/contrib/formtools/templates *

recursive-include django/contrib/formtools/tests/templates *

recursive-include django/contrib/flatpages/fixtures *

django/bin/daily_cleanup.py

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ if __name__ == "__main__": 
    warnings.warn(

        "The `daily_cleanup` script has been deprecated "

        "in favor of `django-admin.py clearsessions`.",

        PendingDeprecationWarning)

        DeprecationWarning)

    management.call_command('clearsessions')