p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,929 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

1028 Commits

Author SHA1 Message Date
Tim Graham 84fa9099c6 Fixed two broken links introduced in recent commits. 2012-09-27 17:33:52 -04: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
Yohan Boniface 5a1bf7eccb Fix little typo in cache documentation 2012-09-25 17:08:07 +02: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
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
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
Ian Clelland 2315f1a2ee Add documentation for get_caches function 2012-09-20 12:07:34 -07: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 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
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
Camilo Nova 17149496a0 Fixes docs typo 2012-09-15 15:45:13 -05: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 a73838fde3 Fixed #11185 - Expanded docs on customizing widgets; thanks fadeev for the draft patch. 2012-09-15 06:22:00 -04:00
Karen Tracey ffe8bc00bf Replaced backwards-incompatible changes reference 
The previously-referenced wiki page documents backwards-incompatible
changes from .96 to 1.0. Changed that referece to point to current
in-development release notes, which is where such changes are now
documented.
 2012-09-09 12:53:32 -04:00
Carl Meyer a78dd109e6 Fixed #15552 -- LOGIN_URL and LOGIN_REDIRECT_URL can take URLpattern names. 
Thanks UloPe and Eric Florenzano for the patch, and Malcolm Tredinnick for
review.
 2012-09-08 16:58:35 -06:00
Tim Graham 518c582966 Fixed #15906 - Documented HEAD method in CBVs; thanks zsiciarz for the patch. 2012-09-08 18:45:02 -04:00
James Bennett 5c5226a520 Fix typo: Non -> None 2012-09-08 16:14:13 -04:00
James Bennett 408c10e541 Untabify multi-db docs. 2012-09-08 16:08:01 -04:00
James Bennett 5d1f09f450 Ticket 18657: Fix inconsistent DB names in router example. 
This rewrites the entire example to use the same DB names throughout,
and also is hopefully a bit more sensibly described. Additionally, the
missing import of the random module for choosing a read slave is
included in the example now.
 2012-09-08 16:02:00 -04:00
Tim Graham 76bd33539f Merge pull request #359 from nmartini/ticket_18832 
Fixed #18832 - Updated ModelForm example fields to match note below
 2012-09-08 10:34:11 -07:00
Michal Petrucha 86e149ae05 Fixed a typo in the Python 3 compatibility docs. 2012-09-08 18:54:33 +02:00
Nick Martini 571698997f fixing modelforms example code, ticket #18832 2012-09-08 12:30:41 -04:00
Aymeric Augustin e69348b4e7 Avoided mixing dates and datetimes in the examples. 
Refs #16023.
 2012-09-08 11:00:04 -04:00
Tim Graham b7d3b057f3 Fixed #18365 - Added a reminder of the context processor required for the set_language view. 
Thanks Nick Martini for the patch.
 2012-09-08 06:56:07 -04:00
Tim Graham dc01e41d23 Fixed #15566 - Documented that update() doesn't honor DateField.auto_now 
Thanks Shabda Raaj for the draft patch.
 2012-09-08 06:38:41 -04:00
Malcolm Tredinnick 6add6170c0 Small reorganisation of initial parts of URL documentation. 
Trying to move most of the introductory example stuff up to the top and
pushing the reference bits further down.
 2012-09-07 19:12:14 -04:00
Aymeric Augustin 7435cc0167 Updated install docs to reflect Python 3 status. 
Closes #17452.
 2012-09-07 17:12:11 -04:00
Alex Gaynor 3a10bcc917 Document ``six.assertRaisesRegex``. 2012-09-07 15:51:22 -04:00
James Bennett 257c4011cb Merge pull request #331 from davidfischer/master 
Ticket #17324 - Improve security docs with better CSRF explanation
 2012-09-07 12:02:53 -07:00
Aymeric Augustin e1a37d5537 [py3] Documented forwards-compatible aliases 
that will be available as of version 1.4.2.
 2012-09-07 11:57:46 -04:00
David Fischer 58786897a1
Formatting fix for host headers section 2012-09-06 16:10:08 -04:00
David Fischer c65100248d
Added CSRF with HTTPS/HSTS and forwarding note 2012-09-06 16:08:14 -04:00
David Fischer ba141e6906
Added note about Strict Transport Security (HSTS) 2012-09-06 15:13:31 -04:00
Matt Stevens a7d831a305 Changes day to from 2 to 30 2012-09-03 16:31:37 +01:00
Matt Stevens 813241f655 Clarifies day and month in example queryset 2012-09-03 15:20:05 +01:00
Tim Graham 03ad7d3c20 Merge pull request #315 from streeter/auth-docs-cleanup-patch 
Clarify some of the password reset docs
 2012-09-01 15:05:18 -07:00
Tim Graham c6088bc91d Fixed #18840 - Added a mentioned of the upload_to parameter to the ModelForm example in file uploads. 2012-09-01 15:38:44 -04:00
Tim Graham 74c025d028 Fixed #13608 - Noted that template lookups use literal values. 2012-09-01 09:24:39 -04:00
Chris Streeter fef641d164 Clarify some of the password reset docs 
Some of the wording was copied from the change password section. Updated
the text to clarify that the we are talking about password resets.
 2012-08-31 16:13:50 -07:00
Florian Apolloner 785980d30e Merge pull request #310 from juanpex/master 
fix documentation testing of Selenium WebDriverWait
 2012-08-31 04:59:59 -07:00
Florian Apolloner fc81854934 Merge pull request #311 from gutworth/py3-doc 
Indexing bytes is the problem not slicing.
 2012-08-31 04:56:42 -07:00
Tim Graham 141e6cd2ac Fixed #18871 - Fixed typo in multi-db docs. 2012-08-30 06:45:11 -04:00
Claude Paroz ebc773ada3 Replaced many smart_bytes by force_bytes 
In all those occurrences, we didn't care about preserving the
lazy status of the strings, but we really wanted to obtain a
real bytestring.
 2012-08-29 11:20:32 +02:00
Benjamin Peterson c87b08d2a1 Indexing bytes is the problem not slicing. 2012-08-28 20:46:42 -04:00
juanpex bfa3d5af34 fix documentation testing of Selenium WebDriverWait 
According to the documentation of Selenium, WebDriverWait class has no timeout parameter and using the code fails.

http://selenium.googlecode.com/svn/trunk/docs/api/java/org/openqa/selenium/support/ui/FluentWait.html#until%28com.google.common.base.Predicate%29
 2012-08-27 21:04:20 -03:00
Tim Graham df7c1a13a0 Fixed #18804 - Reorganized class based views docs a bit; thanks anthonyb for the initial patch. 2012-08-25 08:13:43 -04:00
Tim Graham e57338f2b9 Fixed #18847 - Updated for media examples to use static.example.com. Thanks Jamie Curle. 2012-08-24 08:23:50 -04:00
Carlos Palol f200ffd701 Fixed typo in docs 2012-08-23 16:46:38 +02:00