Commit Graph

1475 Commits

Author SHA1 Message Date
Tim Graham c90156fc18 [1.5.X] Fixed #19348 - Clarified the units of filesizeformat.
Thanks george_edison for the report and Claude Paroz for the patch.

Backport of 63e6cd1bb3 from master
2012-11-23 07:02:29 -05:00
Tim Graham 918d020de2 [1.5.X] Fixed #19346 - Typo in docs/ref/contrib/gis/install/index.txt
Backport of c13912ac7f from master
2012-11-22 18:02:20 -05:00
Tim Graham 42fa51c002 [1.5.X] Fixed #18974 - Warned against using models.permalink
Thanks dstufft for the draft patch.

Backport of 0e3690d230 from master
2012-11-22 16:10:42 -05:00
Tim Graham 84dc6afac7 [1.5.X] Documented behavior of get_or_create when multiple objects are returned.
Thanks Matt Lauber for the patch.

Backport of 71a3162a70 from master
2012-11-22 10:37:17 -05:00
Tim Graham 63546533c1 [1.5.X] Clarified usage of as_view kwargs for setting arguments on class based views
Thanks Dave McLain for the patch.

Backport of 7b2d95eb30 from master
2012-11-22 09:08:37 -05:00
Preston Holmes 6d85f1212f [1.5.x] Added examples of using startproject/app with URLs
thanks to Brent O'Connor for the idea and intial docs
2012-11-21 22:08:04 -08:00
shepdl 187441602c [1.5.X] Fixed #19243 - Edited GeoDjango Tutorial for consistency and style.
Backport of 8e5573e99a from master
2012-11-21 19:32:27 -05:00
Luke Plant aab701f1aa [1.5.x] Corrected docs about default value of MESSAGE_STORAGE
Backport of a32f30c79c from master
2012-11-20 23:06:38 +00:00
Preston Holmes 3a0e0230f7 [1.5.x] Fixed #18658 -- Improved ModelAdmin.message_user API
Thanks to Lowe Thiderman for the patch and tests
2012-11-19 16:03:30 -08:00
Anton Danilchenko 5b6db35a74 [1.5.X] Fixed typo in docs/ref/models/querysets.txt
Backport of 76859e6eab from master
2012-11-19 18:46:36 -05:00
Tim Graham 17c61aaea3 [1.5.X] Fixed #19306 - Improved syndication example.
Thanks brycenesbitt for the report.

Backport of 1f1f60d12f from master
2012-11-18 18:09:00 -05:00
Tim Graham c262252c27 [1.5.X] Fixed #19308 - Clarified stringformat filter example
Thanks Shabda Raaj.

Backport of 2564e31014 from master
2012-11-17 19:32:51 -05:00
Tim Graham 31da2a5e56 [1.5.X] Fixed #13997 - Added an example of constructing a MultiWidget and documented the value_from_datadict method.
Backport of 04775b4598 from master
2012-11-17 17:55:05 -05:00
Aymeric Augustin e8da482bbe [1.5.x] Fixed #19315 -- Improved markup in admin FAQ.
Thanks ClaesBas.

Backport of ccb2b57 from master.
2012-11-17 23:27:27 +01:00
Aymeric Augustin a586f2a7e5 [1.5.x] Fixed #19291 -- Completed deprecation of ADMIN_MEDIA_PREFIX.
Backport of 9b755a2 from master.
2012-11-17 23:05:16 +01:00
Tom Christie 9fa6aa9534 [1.5.x] Formatting tweaks.
(cherry picked from commit 3f2fc2f41a)
2012-11-17 21:31:21 +01:00
Tom Christie 2fdb7e6ca5 [1.5.x] Include `versionadded 1.5` directive
(cherry picked from commit 5bc6929f9a)
2012-11-17 21:31:07 +01:00
Tom Christie 2bfea36208 [1.5.x] Add 'page_kwarg' attribute to `MultipleObjectMixin`, removing hardcoded 'page'.
(cherry picked from commit 502be865c6)
2012-11-17 21:30:22 +01:00
Tim Graham d69c3bf137 [1.5.X] Documented that contrib.sites creates a default site.
Thanks Lorin Hochstein for the patch.

Backport of ac4aa8a76c from master
2012-11-17 06:50:54 -05:00
Brandon Adams cefbf09a4d [1.5.X] Fixed docs noting comment_will_be_sent returns a 400, not a 403
Backport of d8ee46afff from master
2012-11-16 18:20:11 -05:00
Aymeric Augustin 5e9af1600d [1.5.x] Fixed #19283 -- Fixed typo in imports in CBV docs.
Backport of 00ff69a from master.
2012-11-13 20:47:26 +01:00
Nicolas Ippolito b3ea37e304 [1.5.X] Typo in comments doc
Backport of 17b14d4819 from master
2012-11-13 05:25:11 -05:00
Tim Graham 3344d8de3e [1.5.x] Merge pull request #506 from gwrtheyrn/ipv6_doc_fix
Fixed invalid ipv4 mapped ipv6 addresses in docs

Backport of 19eb56a277 from master
2012-11-09 05:49:27 -05:00
Claude Paroz b872617924 [1.5.x] Fixed #19115 -- Documented stdout/stderr options for call_command
Thanks d1ffuz0r for helping with the patch.
Backport of b1ac329ba from master.
2012-11-07 18:36:17 +01:00
Tim Graham 4f36ea451d [1.5.X] Fixed #15968 - Noted that readonly_fields are excluded from the ModelForm
Backport of a386675a6a from master
2012-11-06 19:04:38 -05:00
Tim Graham 79209dfdc5 [1.5.X] Fixed #19246 - Updated SECURE_PROXY_SSL_HEADER example to use 'X-Forwarded-Proto'
Thanks Fred Palmer for the report.

Backport of 2cc1884383 from master
2012-11-06 05:18:12 -05:00
Tim Graham f7d87b30fb [1.5.X] Fixed #15591 - Clarified interaction between ModelForm and model validation.
Backport of d3fd8a1512 from master
2012-11-05 18:30:50 -05:00
Daniel Greenfeld dbe984c397 Fixed #19241 -- Improved floatformat docs
Demonstrate how to round to integers using floatformat templatetag
2012-11-04 17:45:30 -08:00
Alex Gaynor 32d5f03f10 [1.5.x] Added multi-column indexes to the 1.5 release notes. Backport of 957787ace0. 2012-11-04 15:41:58 -08:00
Alex Gaynor 4f6e9c6af2 [1.5.x] Merge pull request #493 from edavis/fix-get-foo-display-docs
Fixed formatting of get_FOO_display example
2012-11-04 11:18:45 -08:00
Alex Gaynor 6f716e9e5f [1.5.x] Fixed #5805 -- it is now possible to specify multi-column indexes. Thanks to jgelens for the original patch. Backport of 4285571c5a. 2012-11-04 10:26:59 -08:00
Tim Graham 26e0651c42 [1.5.X] Fixed #19090 - Added PostgreSQL connection note.
Thanks Melevir for the patch.

Backport of 249c3d730e from master
2012-11-04 05:35:38 -05:00
Ulrich Petri f12fa7750c [1.5.X] Fixed #17549 -- Added a clickable link for URLFields in admin change list.
Backport of ac2052ebc8 from master.
2012-11-03 11:59:16 +01:00
Tim Graham 4a9b3826fd [1.5.X] Fixed #16841 - Documented a couple ModelAdmin methods
* ModelAdmin.get_changelist_form and get_changelist_formset
* InlineModelAdmin.get_formset

Thanks Jordan Reiter for the report.

Backport of 39f5bc7fc3 from master
2012-11-03 05:25:55 -04:00
Preston Holmes 0131da0622 [1.5.x] Deprecated depth kwarg on select_related.
This is the start of a deprecation path for the depth kwarg on
select_related. Removing this will allow us to update select_related so
it chains properly and have an API similar to prefetch_related.

Thanks to Marc Tamlyn for spearheading and initial patch.

refs #16855
2012-11-02 22:03:55 -07:00
Tim Graham 75fb8f433f [1.5.X] Fixed #19120 - Added an example of using ModelAdmin methods for read-only fields.
Thanks Daniele Procida for the patch.

Backport of d1de7596b2 from master
2012-11-02 18:32:43 -04:00
Tim Graham a738d80dd1 [1.5.X] Cleaned up contrib.admin install instructions.
Thanks Cal Leeming for the patch.
\nBackport of 082fad0b83 from master
2012-11-02 18:05:51 -04:00
Tim Graham c5d0f49dc2 [1.5.X] Added WizardView.file_storage exception message and docs
Thanks Danilo Bargen for the patch.

Backport of af7ea808d8 from master
2012-11-01 18:02:32 -04:00
Tim Graham acab68d8a7 [1.5.X] Fixed #19179 - Added mention of NamedUrlSessionWizard and NamedUrlCookieWizard; thanks Tom for the report.
Backport of ede8a0be05 from master
2012-11-01 08:50:54 -04:00
Aymeric Augustin 0dcaddb571 Fixed #17083 -- Allowed sessions to use non-default cache. 2012-10-31 09:51:19 +01:00
Aymeric Augustin 322d858abe [1.5.x] Fixed #19209 -- Documented |date:"I".
Thanks mitar for the report.

Backport of 24b2aad from master.
2012-10-29 23:13:01 +01:00
Aymeric Augustin 39082494e6 [1.5.x] Fixed #18194 -- Expiration of file-based sessions
* Prevented stale session files from being loaded
* Added removal of stale session files in django-admin.py clearsessions

Thanks ej for the report, crodjer and Elvard for their inputs.

Backport of 5fec97b from master.
2012-10-28 09:21:56 +01:00
Aymeric Augustin b760503a27 [1.5.x] Fixed #18978 -- Moved cleanup command to sessions.
This removes a dependency of 'core' on 'contrib'.

Backport of 83ba0a9 from master.

This deprecation occurs after the alpha, but it's a prerequisite
for fixing decently #18194 which is a release blocker.
2012-10-27 18:38:32 +02:00
Tim Graham da958eb209 Fixed #9471 - Expanded ModelAdmin.raw_id_fields docs; thanks adroffne for the suggestion. 2012-10-24 17:43:24 -04:00
Aymeric Augustin 495a8b8107 Fixed #6527 -- Provided repeatable content access
in HttpResponses instantiated with iterators.
2012-10-24 17:08:37 +02:00
Aymeric Augustin 104ca49c57 Removed inaccurate statement from the StreamingHttpResponse docs.
Iterators will be closed for both regular and streaming responses;
this shouldn't be described as a difference.
2012-10-21 22:44:02 +02:00
Tim Graham 2f722d9728 Fixed #13869 - Warned that QuerySet.iterator() doesn't affect DB driver caching; thanks jtiai for the suggestion. 2012-10-20 15:22:34 -04:00
Aymeric Augustin 4b27813198 Fixed #7581 -- Added streaming responses.
Thanks mrmachine and everyone else involved on this long-standing ticket.
2012-10-20 20:05:11 +02:00
Tim Graham 300d052713 Fixed arguments for get_inline_instances example; refs #17856 2012-10-20 09:57:15 -04:00
Aymeric Augustin c2e19e26bc Fixed #17856 -- Passed obj to get_inline_instances
Thanks ybon, quinode and sjaensch for the patch, and Tim Graham
for the review.
2012-10-20 15:49:52 +02:00
Claude Paroz dfd4a71751 Fixed #5611 -- Restricted accepted content types in parsing POST data
Thanks paulegan for the report and Preston Holmes for the review.
2012-10-20 14:56:16 +02:00
Tim Graham eed4faf16f Fixed #17006 - Documented ModelAdmin get_form() and get_formsets() 2012-10-20 08:40:54 -04:00
Claude Paroz 3084b1cfd6 Separated GIS installation docs in sections 2012-10-20 11:08:52 +02:00
Tim Graham db598dd8a0 Fixed #18046 - Documented than an index is created by default for ForeignKeys; thanks jbauer for the suggestion. 2012-10-18 16:58:05 -04:00
Preston Holmes 31dcaf49a0 Fixed an error in cookie documentation 2012-10-17 14:53:21 -07:00
Tim Graham 3e0857041b Fixed #18473 - Fixed a suggestion that GZipMiddleware needs to be first in the list of middleware. 2012-10-17 15:46:59 -04:00
Adrian Holovaty 1636b03382 Added docs link to new third-party Lithuanian localflavor 2012-10-15 14:18:16 -05:00
Claude Paroz 22742e4ac4 Added ref to format localization in Date[Time]Field docs
Thanks henrik@aisti.fi for the suggestion in #19119.
2012-10-13 11:17:25 +02:00
Claude Paroz 10dc4797ea Fixed #19119 -- Corrected default date input formats in docs
Thanks henrik@aisti.fi for the report.
2012-10-13 11:02:18 +02:00
Tim Graham c870cb48cd Fixed #18256 - Added a potential pitfall when upgrading to MySQL 5.5.5 2012-10-12 19:17:00 -04:00
Adrian Holovaty f8c3acc807 Updated localflavor docs to note the new packages 2012-10-12 17:00:35 -05:00
Brian Galey 95f7ea3af1 Fixed #19028 -- Support GeoJSON output with SpatiaLite 3.0+ 2012-10-12 17:23:22 +02:00
Tim Graham 2d1214d92a Fixed #14165 - Documented that TransactionMiddleware only applies to the default database. 2012-10-11 17:47:37 -04:00
Preston Holmes c99ad64df7 Fixed #19097 -- documented module of origin for HttpRes/req objects 2012-10-09 20:30:28 -07:00
Ramiro Morales ec1aad1671 Added section about URL reversion to URL mapper document. 2012-10-07 20:21:07 -03:00
Ramiro Morales 69035b0b1c More URL mapping documentation fixes. 2012-10-06 16:35:22 -03:00
Ramiro Morales b6b8a3f66b Refactored URL mapping documentation.
Reorganized topic document so it introduces concepts form simple to more
complex. Moved reference parts to their own documents.
2012-10-06 11:27:20 -03:00
Tim Graham 6d46c740d8 Fixed #17435 - Clarified that QuerySet.update returns the number of rows matched 2012-10-06 07:03:20 -04:00
Claude Paroz ab8c970368 Fixed #19072 -- Corrected an external file path in GeoIP docs
Thanks Flavio Curella for the report and the initial patch.
2012-10-05 23:17:21 +02:00
Preston Holmes ab696e3a21 Merge pull request #425 from Osmose/queryset_doc_typo
Fixed typo in queryset docs under update method.
2012-10-05 09:08:35 -07:00
Michael Kelly 074e65b04a Fixed typo in queryset docs under update method. 2012-10-05 11:32:28 -04:00
John Paulett 7251282893 Fixed #17207 -- Added a troubleshooting note about failing createdb 2012-10-04 09:51:14 +02:00
Claude Paroz 89544b2bd2 Readded docs anchor removed in 92b5341b and still in use 2012-10-04 09:51:14 +02:00
Tim Graham 234ca6c61d Fixed #19006 - Quoted filenames in Content-Disposition header. 2012-10-03 17:44:56 -04:00
Tim Graham 1c03b23567 Fixed #18413 - Noted that a model's files are not deleted when the model is deleted. Thanks lawgon for the report. 2012-10-03 17:43:23 -04:00
Stephen Burrows 218abcc9e5 Fixed #14567 -- Made ModelMultipleChoiceField return EmptyQuerySet as empty value 2012-10-03 20:47:35 +03:00
Claude Paroz c76877c1d2 Added a note about postgis_topology in install docs
Thanks Paolo Corti for the suggestion.
2012-10-03 12:59:24 +02:00
Preston Holmes e7723683dc Fixed #9279 -- Added ignorenonexistent option to loaddata
Thanks to Roman Gladkov for the initial patch and Simon Charette for review.
2012-09-30 23:40:27 -07:00
Claude Paroz 8bd7b598b6 Fixed #18807 -- Made 404.html and 500.html optional
Thanks Aymeric Augustin for the report and Jannis Leidel for the
review.
2012-09-30 23:16:19 +02:00
Flavio Curella 92b5341b19 Fixed #16455 -- Added support for PostGIS 2.0
Thanks ckarrie for the report and the initial patches, Flavio Curella
for updating the patch, and Anssi Kääriäinen for testing. See ticket
for other valuable contributors.
2012-09-30 22:49:41 +02:00
Tim Graham d0345b7114 Fixed #15338 - Documented django.utils.decorators 2012-09-30 13:37:57 -04:00
Anssi Kääriäinen dad7eec6e1 Corrected links to only()/defer() in Model documentation
Refs #18306
2012-09-30 02:45:50 +03:00
Tim Graham 15202baace Fixed #17058 - Clarified where extras/csrf_migration_helper.py is located 2012-09-29 16:41:55 -04:00
Florian Apolloner 6a6f589bfe Merge branch 'ticket15695' 2012-09-29 21:57:50 +02:00
Claude Paroz 8867c27613 Added link to PostGIS matrix on OSGeo Wiki 2012-09-29 20:04:08 +02:00
Claude Paroz ffdd6595ea Fixed #18919 -- Stopped dropping Z attribute when transforming geometries
Previously, the wkb of geometries was dropping the Z attribute.
Thanks luizvital for the report and tests and georger.silva@gmail.com
for the tests.
2012-09-29 12:33:18 +02:00
Claude Paroz 2f6e00a840 Fixed #11948 -- Added interpolate and project linear referencing methods
Thanks novalis for the report and the initial patch, and Anssi
Kääriäinen and Justin Bronn for the review.
2012-09-29 11:22:28 +02:00
Tim Graham fea0ca4334 Fixed #12871 - Documented creation of a comment form for authenticated users; thanks shacker for patch. 2012-09-28 17:36:53 -04:00
Claude Paroz 6c2faaceb0 Made more extensive use of get_current_site
Refs #15089
2012-09-28 20:33:05 +02:00
Anssi Kääriäinen 1cd6e04cd4 Fixed #18676 -- Allow fast-path deletion of objects
Objects can be fast-path deleted if there are no signals, and there are
no further cascades. If fast-path is taken, the objects do not need to
be loaded into memory before deletion.

Thanks to Jeremy Dunck, Simon Charette and Alex Gaynor for reviewing
the patch.
2012-09-28 18:16:08 +03: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
Florian Apolloner b946db5241 Fixed #15695 -- Added `ResolverMatch` to the request object. 2012-09-27 15:06:58 +02: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
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
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
Preston Holmes 2b1ae4dbd2 Fixed #19008 typo in signals docs 2012-09-21 16:22:50 -07:00
Tim Graham 837425b425 Fixed #18934 - Removed versionadded/changed annotations for Django 1.3 2012-09-20 19:06:55 -04:00