p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,930 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

4739 Commits

Author SHA1 Message Date
Carl Meyer 751a7d0c32 Fixed #18518 -- Add warning re mod_wsgi and wsgi.py environ handling. 2012-09-27 20:35:57 -06:00
Tim Graham e44bedd13f Fixed a typo in runserver docs 2012-09-27 20:25:31 -04:00
Tim Graham d08096317a Fixed #11460 - Added a FAQ regarding missing rows in the admin. 2012-09-27 17:36:02 -04:00
Tim Graham 84fa9099c6 Fixed two broken links introduced in recent commits. 2012-09-27 17:33:52 -04:00
Preston Holmes 1df58968a4 Added a note regarding interaction between GitHub and Trac Plugin 2012-09-27 13:19:04 -07:00
Preston Holmes 373932fa6b fixed #10809 -- add a mod_wsgi authentication handler 
Thanks to baumer1122 for the suggestion and initial 
patch and David Fischer for the contributions and
long term patch maintenance and docs.
 2012-09-27 12:43:37 -07:00
Adrien Lemaire 2c8267bf3d Fixed #17899 -- Rewrote [Ee]-mail to [Ee]mail 2012-09-26 14:14:51 +02:00
Russell Keith-Magee 70a0de37d1 Fixed #3011 -- Added swappable auth.User models. 
Thanks to the many people that contributed to the development and review of
this patch, including (but not limited to) Jacob Kaplan-Moss, Anssi
Kääriäinen, Ramiro Morales, Preston Holmes, Josh Ourisman, Thomas Sutton,
and Roger Barnes, as well as the many, many people who have contributed to
the design discussion around this ticket over many years.

Squashed commit of the following:

commit d84749a0f0
Merge: 531e771 7c11b1a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Wed Sep 26 18:37:04 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 531e7715da
Merge: 29d1abb 1f84b04
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Wed Sep 26 07:09:23 2012 +0800

    Merged recent trunk changes.

commit 29d1abbe35
Merge: 8a527dd 54c81a1
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 24 07:49:46 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 8a527dda13
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 24 07:48:05 2012 +0800

    Ensure sequences are reset correctly in the presence of swapped models.

commit e2b6e22f29
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 23 17:53:05 2012 +0800

    Modifications to the handling and docs for auth forms.

commit 98aba856b5
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 23 15:28:57 2012 +0800

    Improved error handling and docs for get_user_model()

commit 0229209c84
Merge: 6494bf9 8599f64
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 23 14:50:11 2012 +0800

    Merged recent Django trunk changes.

commit 6494bf91f2
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 17 21:38:44 2012 +0800

    Improved validation of swappable model settings.

commit 5a04cde342
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Sep 17 07:15:14 2012 +0800

    Removed some unused imports.

commit ffd535e413
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 20:31:28 2012 +0800

    Corrected attribute access on for get_by_natural_key

commit 913e1ac84c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 20:12:34 2012 +0800

    Added test for proxy model safeguards on swappable models.

commit 280bf19e94
Merge: dbb3900 935a863
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 18:16:49 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit dbb3900775
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 18:09:27 2012 +0800

    Fixes for Python 3 compatibility.

commit dfd72131d8
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 15:54:30 2012 +0800

    Added protection against proxying swapped models.

commit abcb027190
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 15:11:10 2012 +0800

    Cleanup and documentation of AbstractUser base class.

commit a9491a8776
Merge: fd8bb4e 08bcb4a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 14:46:49 2012 +0800

    Merge commit '08bcb4aec1ed154cefc631b8510ee13e9af0c19d' into t3011

commit fd8bb4e3e4
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 14:20:14 2012 +0800

    Documentation improvements coming from community review.

commit b550a6d06d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 13:52:47 2012 +0800

    Refactored skipIfCustomUser into the contrib.auth tests.

commit 52a02f1110
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 13:46:10 2012 +0800

    Refactored common 'get' pattern into manager method.

commit b441a6bbc7
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 16 13:41:33 2012 +0800

    Added note about backwards incompatible change to admin login messages.

commit 08bcb4aec1
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date:   Sat Sep 15 18:30:33 2012 +0300

    Splitted User to AbstractUser and User

commit d9f5e5addb
Author: Anssi Kääriäinen <akaariai@gmail.com>
Date:   Sat Sep 15 18:30:02 2012 +0300

    Reworked REQUIRED_FIELDS + create_user() interaction

commit 579f152e4a
Merge: 9184972 93e6733
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 20:18:37 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 918497218c
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 20:18:19 2012 +0800

    Deprecate AUTH_PROFILE_MODULE and get_profile().

commit 334cdfc1bb
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 20:00:12 2012 +0800

    Added release notes for new swappable User feature.

commit 5d7bb22e8d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 19:59:49 2012 +0800

    Ensure swapped models can't be queried.

commit 57ac6e3d32
Merge: f2ec915 abfba3b
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 15 14:31:54 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit f2ec915b20
Merge: 1952656 5e99a3d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 08:29:51 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 19526563b5
Merge: 2c5e833 c4aa26a
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 08:22:26 2012 +0800

    Merge recent changes from master.

commit 2c5e833a30
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 07:53:46 2012 +0800

    Corrected admin_views tests following removal of the email fallback on admin logins.

commit 20d1892491
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sun Sep 9 01:00:37 2012 +0800

    Added conditional skips for all tests dependent on the default User model

commit 40ea8b8882
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 8 23:47:02 2012 +0800

    Added documentation for REQUIRED_FIELDS in custom auth.

commit e6aaf65970
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Sat Sep 8 23:20:02 2012 +0800

    Added first draft of custom User docs.

    Thanks to Greg Turner for the initial text.

commit 75118bd242
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date:   Mon Aug 20 11:17:26 2012 +0800

    Admin app should not allow username discovery

    The admin app login form should not allow users to discover the username
    associated with an email address.

commit d088b3af58
Author: Thomas Sutton <me@thomas-sutton.id.au>
Date:   Mon Aug 20 10:32:13 2012 +0800

    Admin app login form should use swapped user model

commit 7e82e83d67
Merge: e29c010 39aa890
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Fri Sep 7 23:45:03 2012 +0800

    Merged master changes.

commit e29c010beb
Merge: 8e3fd70 30bdf22
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Aug 20 13:12:57 2012 +0800

    Merge remote-tracking branch 'django/master' into t3011

commit 8e3fd703d0
Merge: 507bb50 26e0ba0
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Aug 20 13:09:09 2012 +0800

    Merged recent changes from trunk.

commit 507bb50a92
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Jun 4 20:41:37 2012 +0800

    Modified auth app so that login with alternate auth app is possible.

commit dabe362836
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Jun 4 20:10:51 2012 +0800

    Modified auth management commands to handle custom user definitions.

commit 7cc0baf89d
Author: Russell Keith-Magee <russell@keith-magee.com>
Date:   Mon Jun 4 14:17:28 2012 +0800

    Added model Meta option for swappable models, and made auth.User a swappable model
 2012-09-26 18:48:09 +08:00
Tim Graham 7c11b1a470 Merge pull request #391 from reverie/patch-1 
Fixed typo in context_processors.auth
 2012-09-26 01:13:09 -07:00
Yohan Boniface 5a1bf7eccb Fix little typo in cache documentation 2012-09-25 17:08:07 +02:00
Andrew Badr 29cd3d6c01 Fix docs for context_processors.auth 
Copy said it created three context variables, but only lists two. ("messages" was removed.)
 2012-09-24 17:14:11 -07:00
Claude Paroz fc69fff9ab Fixed #14861 -- Moved logging config outside of Settings.__init__ 
Thanks donspaulding for the report and simonpercivall for the
initial patch.
 2012-09-24 22:12:45 +02:00
Aymeric Augustin 98b6ce60f4 Made a version condition less confusing. 
Fixed #18762 (again).
 2012-09-23 20:18:29 +02:00
Tim Graham 2aaa467a2a Fixed #18057 - Documented that caches are not cleared after each test; thanks guettli for the suggestion. 2012-09-22 07:09:12 -04:00
Aymeric Augustin 822cfce3df Fixed #18951 -- Formatting of microseconds. 
Thanks olofom at gmail com for the report.
 2012-09-22 12:02:21 +02:00
Aymeric Augustin baa33cd8fa Fixed #16218 -- date_list order in generic CBVs. 
Thanks nnrcschmdt for the report and bpeschier for the initial
version of the patch.
 2012-09-22 11:47:34 +02:00
Dan Loewenherz 69ff1b7390 Fixed #16835 -- add groups to auth.user admin list_filter 2012-09-22 00:16:22 -07:00
Preston Holmes 2b1ae4dbd2 Fixed #19008 typo in signals docs 2012-09-21 16:22:50 -07:00
Tim Graham e758ecc628 Merge pull request #386 from clelland/ticket_15269 
Fixed #15269 - Added documentation for get_caches function
 2012-09-21 04:07:26 -07:00
Tim Graham 837425b425 Fixed #18934 - Removed versionadded/changed annotations for Django 1.3 2012-09-20 19:06:55 -04:00
Alex Gaynor e06b54391d Removed an excess colon. Thanks to jMyles for the patch. 2012-09-20 13:49:26 -07:00
Ian Clelland 2315f1a2ee Add documentation for get_caches function 2012-09-20 12:07:34 -07:00
Claude Paroz 89136b2725 Fixed #16577 -- Added a map_creation block in openlayers.js template 2012-09-20 10:31:37 +02:00
Claude Paroz 3ae397a98c Added a note about GEOS support for 3D/4D WKT notation 
See also http://trac.osgeo.org/geos/ticket/347
 2012-09-20 09:40:18 +02:00
Tim Graham 0fdfcee257 Fixed #15325 - Added a link to RelatedManager in the ManytoManyField docs; thanks jammon for the suggestion. 2012-09-19 18:00:14 -04:00
Tim Graham acd74ffa35 Fixed #14829 - Added references to CBVs in the URLConf docs; thanks Andrew Willey for the suggestion. 2012-09-19 17:59:47 -04:00
Tim Graham 1360bd4186 Fixed #13586 - Added an example of how to connect a m2m_changed signal handler. 2012-09-19 15:09:49 -04:00
Carl Meyer 4e9a74b81d Revert "Fixed #16865 -- Made get_or_create use read database for initial get query." 
Thanks to Jeremy Dunck for pointing out the problem with this change. If in a
single transaction, the master deletes a record and then get_or_creates a
similar record, under the new behavior the get_or_create would find the record
in the slave db and fail to re-create it, leaving the record nonexistent, which
violates the contract of get_or_create that the record should always exist
afterwards. We need to do everything against the master here in order to ensure
correctness.

This reverts commit 901af86550.
 2012-09-19 11:15:12 -06:00
Carl Meyer 901af86550 Fixed #16865 -- Made get_or_create use read database for initial get query. 
Thanks Rick van Hattem for the report and trbs for the patch.
 2012-09-19 10:06:53 -06:00
Collin Anderson b771bcc7b4 document changes for YearArchiveView. 2012-09-18 11:06:10 -04:00
Preston Holmes b1b32b2074 Added myself as a committer. 2012-09-17 22:02:16 -07:00
Tim Graham 89e809c400 Merge pull request #195 from pydanny/ajax-docs-example 
Added example of AJAX form submission for CBVs.
 2012-09-17 16:02:07 -07:00
Florian Apolloner 23d0136314 Merge branch 'lotheac-fix_uploaded_file_exec' 2012-09-17 22:54:26 +02:00
Florian Apolloner e8c6aff3bf Fixed #18947 -- Don't make uploaded files executeable by default. 
Thanks to Lauri Tirkkonen for the patch.
 2012-09-17 22:53:10 +02:00
Marc Tamlyn b16f8b5fbe Add example of AJAX form submission. 
Credit goes to @SystemParadox. Originally developed at #DjangoCon Europe
but wasn't tested enough to merge in.

For history, please see https://github.com/pydanny/django/pull/4
 2012-09-17 08:56:43 +01:00
Florian Apolloner 935a8635c2 Merge pull request #372 from ptone/patch-2 
Clearer wording for defer docs
 2012-09-16 02:45:44 -07:00
Preston Holmes 8d75b1176f Clearer wording for defer docs 2012-09-15 14:24:01 -07:00
Camilo Nova 17149496a0 Fixes docs typo 2012-09-15 15:45:13 -05:00
Tim Graham 93e6733e4c Fixed #18131 - Documented ContentTypeManager.get_for_id; thanks sir_sigurd for the report. 2012-09-15 08:15:54 -04:00
Tim Graham 22242c510f Fixed #16929 - Documented how to extend UserAdmin with UserProfile fields; thanks charettes for the draft example. 2012-09-15 07:38:34 -04:00
Tim Graham 553583958d Added an example of using a form wizard with different templates; thanks Lorin Hochstein for the patch. 2012-09-15 07:16:07 -04:00
Tim Graham e5f8fe27ac Removed reference to note removed in a78dd109e6c81c49e90e36e9b793bad67c46c23c; refs #15552 2012-09-15 06:41:58 -04:00
Tim Graham a73838fde3 Fixed #11185 - Expanded docs on customizing widgets; thanks fadeev for the draft patch. 2012-09-15 06:22:00 -04:00
Claude Paroz 65793d714c Used ST_AsText for testing PostGIS raw query 
AsText will not be supported in further versions of PostGIS (>=2).
 2012-09-15 12:02:28 +02:00
Bryan Veloso abfba3bb65 Correcting my English. 2012-09-14 19:26:11 -07:00
Bryan Veloso a01bce1e26 Adding myself to the committers list. 2012-09-14 19:24:39 -07:00
Jeremy Dunck 9db7652eef Fixed my terribly outdated profile in committers.txt in celebration of my commit bit. 2012-09-12 14:37:44 -07:00
Julien Phalip 0133d66734 Removed a colloquialism ("and then some") from the documentation index page that would be confusing to non-native English speakers. 2012-09-10 17:27:50 -07:00
Julien Phalip 6eb4f25692 Removed an obsolete documentation page about admin style customization. 2012-09-10 17:19:35 -07:00
Claude Paroz f1bdfbd24b Document and test 'type' usage in Widget attrs 
Refs #16630.
 2012-09-10 19:31:11 +02:00