Commit Graph

1204 Commits

Author SHA1 Message Date
Tim Graham 528483cae2 [1.5.X] Fixed #19279 - Clarified order of database setup and Django install.
Thanks colinnkeenan for the suggestion.

Backport of 72a6ac568d from master
2012-12-16 15:46:17 -05:00
Russell Keith-Magee 311bd0055d [1.5.X} Fixed #19412 -- Added PermissionsMixin to the auth.User heirarchy.
This makes it easier to make a ModelBackend-compliant (with regards to
permissions) User model.

Thanks to cdestigter for the report about the relationship between
ModelBackend and permissions, and to the many users on django-dev that
contributed to the discussion about mixins.

Backport of 47e1df896b from master.
2012-12-15 22:47:48 +08:00
Russell Keith-Magee a7465ee7df [1.5.X] Fixed #19472 -- Documented the testing requirements and tools for custom User models.
Thanks to gcc for the report.

Backport of bd414aed01 from master.
2012-12-15 22:47:30 +08:00
Russell Keith-Magee 9cf566233b [1.5.X] Fixed #19384 -- Documented the behavior of custom managers on abstract models.
This documents the behavior introduced by cc337a74, which is BACKWARDS
INCOMPATIBLE for any attempt to invoke a method on a manager using the
abstract class as the calling class (e.g., AbstractBase.objects.do_something())

Thanks to mhsparks for the report.

Backport of 1b646e656e from master.
2012-12-15 22:46:55 +08:00
Ben Longden 0c3e4848b6 [1.5.X] Removed PHP references
Backport of 55a2d5b577 from master
2012-12-14 19:33:48 -05:00
Aymeric Augustin 44e56238d7 [1.5.x] Fixed #2304 -- Documented TRANSACTIONS_MANAGED.
Backport of a001f3c.
2012-12-14 21:16:04 +01:00
Tim Graham 8a1b4dbda2 [1.5.X] Fixed #19461 - Linked to psycopg in topics/install.txt
Thanks Chris Jerdonek for the suggestion.

Backport of 6cad5f212a from master
2012-12-11 18:45:03 -05:00
Florian Apolloner 77b06e4151 [1.5.X] Fixed a security issue in get_host.
Full disclosure and new release forthcoming.
2012-12-10 22:13:28 +01:00
Claude Paroz fce779475e [1.5.x] Removed US localflavor-specific tests from core
Also fixes #9045.
Backport of 8248d1402 from master.
2012-12-08 21:08:37 +01:00
Val Neekman 152d6cb411 fix a spelling error in docs
backport of cacafe8 from master.
2012-12-08 14:51:41 +01:00
Tim Graham 88638ddd3d [1.5.X] Fixed #19400 - Typo in docs/topics/auth.txt
Backport of 008e625c66 from master
2012-11-30 15:13:51 -05:00
Tim Graham 931b0f8ccd [1.5.X] Fixed #19352 - Added an example in the QuerySet docs.
Thanks colinkeenan for the suggestion.

Backport of ba2adc9c05 from master
2012-11-27 18:22:49 -05:00
Russell Keith-Magee 24582f18ff [1.5.x] Fixed #19218 -- Added documentation note on limitations of signals with custom User models.
Thanks to kunitoki@gmail.com for the report.

Backport of fdb5c98d7e.
2012-11-24 14:27:11 +08:00
Aymeric Augustin a79e4521e5 [1.5.x] Negligible style fix in docs.
Backport of 5c81e9d.
2012-11-23 20:41:08 +01:00
WoLpH f88319dc3c [1.5.X] Changed if statement to a slightly cleaner variant
Backport of eabb44417c from master
2012-11-23 07:13:24 -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
Aymeric Augustin 9bd67f056c [1.5.x] Fixed #16039 -- Made post_syncdb handlers multi-db aware.
Also reverted 8fb7a90026. Refs #17055.

Backport of a026e48 from master.
2012-11-22 20:54:20 +01:00
Tim Graham 6d13071021 [1.5.X] Fixed #19335 - Typo and cleanups in docs/topics/class-based-views/index.txt
Backport of e2b1808196 from master
2012-11-21 19:07:36 -05:00
Alex Gaynor 911d3581ea [1.5.x] fixed a broken link in the docs. Backport of 1e34fd3c03 2012-11-13 14:49:08 -08:00
David Cramer d33f8d0f54 [1.5.x] Correct link to Sentry
django-sentry is no longer maintained, and sentry is the replacement.

Backport of 54fbe6c and c91a127 from master, as requested by Mr Gaynor.
2012-11-13 23:00:35 +01: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
Tim Graham 5b190733e9 [1.5.X] Fixed #19161 - Added missing clean_password method in custom user docs
Thanks DavidW for the report.

Backport of e8f696097b from master
2012-11-06 19:46:40 -05:00
Tim Graham 84e33545c9 [1.5.X] Fixed #19154 - Noted commit_manually requires commit/rollback for reads
Thanks als for the report.

Backport of 620e0bba49 from master
2012-11-06 17:50:00 -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
Claude Paroz b61778dcf6 [1.5.x] Fixed #6234 -- Removed obsolete note about json and ensure_ascii
Thanks aaron at cellmap.ca for the report.
Backport of 4e8d9524c from master.
2012-11-03 23:56:04 +01:00
Aymeric Augustin d7688a010a [1.5.x] Fixed #18963 -- Used a subclass-friendly pattern
for Python 2 object model compatibility methods.

Backport of fc10418 from master.
2012-11-03 22:08:05 +01:00
Markus Zapke-Gründemann 4b2fb7efea [1.5.X] Fixed #19230 -- Extended the handler403 documentation.
Backport of 0546794397 from master.

Added a paragraph on how to use the PermissionDenied exception to create a 403
response and use handler403.
2012-11-03 17:19:26 +01:00
Tim Graham 90af863410 [1.5.X] Fixed #19167 - Added a warning regarding module-level database queries
Thanks Daniele Procida for the patch.

Backport of 07361d1fd6 from master
2012-11-02 18:20:32 -04:00
Tim Graham ffc649df88 [1.5.X] Fixed #15361 - Documented performance considerations for QuerySet.get()
Thanks mmcnickle for the patch.

Backport of feaf9f279a from master
2012-11-02 17:59:51 -04:00
Florian Apolloner 6b1f73113a [1.5.x] Documented minimal python 3.2 version.
Backport of 0d8432da55 from master.
2012-11-02 10:52:15 +01:00
Aymeric Augustin 71dbc01ad7 Fixed #19225 -- Typo in shortcuts docs.
Thanks SunPowered for the report.
2012-11-02 09:30:31 +01: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
Aymeric Augustin 0dcaddb571 Fixed #17083 -- Allowed sessions to use non-default cache. 2012-10-31 09:51:19 +01:00
Claude Paroz a24ffa52d0 [1.5.x] Fixed #17744 -- Reset default file storage with setting_changed signal
Backport of 9a0285134 from master.
2012-10-30 22:26:03 +01:00
Preston Holmes f427ecdc88 [1.5.x] Fixed #19061 -- added is_active attribute to AbstractBaseUser 2012-10-28 23:06:09 -07: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 845d8408e7 [1.5.x] Added optional kwargs to get_expiry_age/date.
This change allows for cleaner tests: we can test the exact output.

Refs #18194: this change makes it possible to compute session expiry
dates at times other than when the session is saved.

Fixed #18458: the existence of the `modification` kwarg implies that you
must pass it to get_expiry_age/date if you call these functions outside
of a short request - response cycle (the intended use case).

Backport of cd17a24 from master.
2012-10-28 09:20:54 +01:00
Claude Paroz c5da577b9e [1.5.x] Fixed #17787 -- Documented reset caches by setting_changed signal
Backport of fc2681b22 from master.
2012-10-27 22:04:06 +02:00
Florian Apolloner cb2817543f [1.5.x] Removed a redundant colon in the query docs.
Thanks to Berker Peksag for the patch.

Backport of 4f11b7362206224ad876018bba19b7c9a08b7f0b from master.
2012-10-27 21:20:21 +02: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
Claude Paroz 02b66f161f [1.5.x] Fixed #19191 -- Corrected a typo in CustomUser docs
Thanks spleeyah for the report.

Backport of 90c7656 from master.
2012-10-26 10:26:47 +02: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
Claude Paroz 0775ab2955 Fixed #19132 -- Added example for creating custom lazy function
Thanks flagzeta@yahoo.it for the report and Luke Plant for his
expert assistance.
2012-10-18 09:02:20 +02:00
Preston Holmes 31dcaf49a0 Fixed an error in cookie documentation 2012-10-17 14:53:21 -07:00
Tim Graham fd02bcff4a Fixed #18548 - Clarified note regarding reusing model instances when form validation fails. 2012-10-16 20:39:13 -04:00
Tim Graham 9190d89829 Fixed #10936 - Tempered recommendation of SQLite - thanks Karen Tracey for the feedback. 2012-10-15 19:55:46 -04:00
Russell Keith-Magee b3b3db3d95 Fixed #19067 -- Clarified handling of username in createsuperuser.
Thanks to clelland for the report, and Preston Holmes for the draft patch.
2012-10-13 13:36:07 +08:00
Russell Keith-Magee c433fcb3fb Fixed #19077, #19079 -- Made USERNAME_FIELD a required field, and modified UserAdmin to match. 2012-10-13 11:44:50 +08:00
Tim Graham 5fb22329a1 Merge pull request #422 from elvard/18996
Fixed #18996 - Clarified overriden model methods not called on bulk operations
2012-10-12 16:45:45 -07:00
Tim Graham 470deb5cbb Fixed #10936 - Noted that using SQLite for development is a good idea 2012-10-11 20:01:30 -04:00
Tim Graham 6b56aeec6e Merge pull request #428 from donspaulding/patch-1
Removed extra indent in docs/topics/db/queries.txt
2012-10-11 16:19:32 -07:00
Tim Graham dd0cbc6bdc Fixed #16588 - Warned about field names that conflict with the model API 2012-10-11 18:05:12 -04:00
Ramiro Morales 0614e99fbd More URL reversion docs typo fixes. 2012-10-11 15:40:38 -03:00
Tim Graham 0921b74e69 Merge pull request #437 from dmedvinsky/bug/docs-typo-reversing
Fixed typo in URL reversing docs
2012-10-11 03:15:39 -07:00
Tim Graham 06f5da3d78 Fixed #16817 - Added a guide of code coverage to contributing docs.
Thanks Pedro Lima for the draft patch.
2012-10-11 06:11:52 -04:00
Dmitry Medvinsky b498ce8203 Fix typo in URLs reversing docs 2012-10-11 12:38:14 +04:00
Tim Graham 7ef2781ca0 Fixed #4501 - Documented how to use coverage.py with Django tests.
Thanks krzysiumed for the draft patch.
2012-10-10 20:03:27 -04:00
Anssi Kääriäinen b625e8272b Moved F() '&' and '|' to .bitand() and .bitor()
Done for consistency with Q() expressions and QuerySet combining. This
will allow usage of '&' and '|' as boolean logical operators in the
future. Refs #16211.
2012-10-10 01:15:29 +03:00
Anssi Kääriäinen a8b1861fc4 Revert "Fixed #16211 -- Added comparison and negation ops to F() expressions"
This reverts commit 28abf5f0eb.

Conflicts:

	docs/releases/1.5.txt
2012-10-10 01:15:29 +03: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
Claude Paroz 117e99511e Added assertXML[Not]Equal assertions
This is especially needed to compare XML when hash randomization
is on, as attribute order may vary. Refs #17758, #19038.
Thanks Taylor Mitchell for the initial patch, and Ian Clelland for
review and cleanup.
2012-10-06 13:14:50 +02:00
Tim Graham 6d46c740d8 Fixed #17435 - Clarified that QuerySet.update returns the number of rows matched 2012-10-06 07:03:20 -04:00
Russell Keith-Magee 12f39be508 Fixed #19074 -- Corrected some minor issues with the new custom User docs.
Thanks to Bradley Ayers for the review.
2012-10-06 12:46:35 +08:00
Don Spaulding 70fac984c8 Fixed format-o in docs/topics/db/queries.txt
It appears that our infamous villain, Significant Whitespace,
has struck again.

In this episode, little Timmy finds himself trapped in a
code well.  He need not despair, however, as Indentation Man
has heard his cries for help and sprung into action.

With his feline helper, Octocat, at his side, Indentation Man
races to the scene, flings open a web-based code editor, and with
terrific aplomb, frees Timmy to be the documentation he always
wanted to be.

Once again Goodness has prevailed.  In the fight for readable
documentation, no stray whitespace will ever be able to
withstand the str.strip()ing nature of....INDENTATION MAN.
2012-10-05 19:17:00 -05:00
Tomáš Ehrlich 443999a1ee Fixed #18996 - Docs on overriden model methods 2012-10-04 14:03:48 +02:00
Tim Graham a1a5c0854f Fixed #19051 - Fixed Selenium tearDownClass method; thanks glarrain for the report. 2012-10-04 06:45:22 -04:00
Preston Holmes 030b55393e Removed incorrectly reintroduced 1.3 version notes 2012-10-01 14:53:21 -07: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
Michael Farrell 7cc4068c44 Fixed #18616 -- added user_login_fail signal to contrib.auth
Thanks to Brad Pitcher for documentation
2012-09-30 22:34:50 -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
Anssi Kääriäinen d5a4f209c3 Fixed #18991 -- Allowed permission lookup by "if in"
When looking permissions from PermWrapper it is now possible to use
{% if "someapp.someperm" in perms %} instead of
{% if perms.someapp.someperm %}.
2012-09-30 19:38:16 +03:00
Anssi Kääriäinen 28abf5f0eb Fixed #16211 -- Added comparison and negation ops to F() expressions
Work done by Walter Doekes and Trac alias knoeb. Reviewed by Simon
Charette.
2012-09-30 17:51:06 +03:00
Claude Paroz f0f327bbfe Fixed #18993 -- 'django' logger logs to console when DEBUG=True
Thanks Preston Holmes for the review.
2012-09-29 22:56:18 +02:00
Claude Paroz a014ddfef2 Combined Django DEFAULT_LOGGING with user LOGGING config
Refs #18993.
2012-09-29 22:56:18 +02:00
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
Tim Graham e06189f7ce Merge pull request #297 from mjjohnson/ticket_17069
Fixed #17069 -- Added log filter example to docs.
2012-08-22 17:36:46 -07:00
Tim Graham 13d47c3f33 Fixed #18637 - Updated some documentation for aspects of models that are ModelForm specific, not admin specific.
Thanks Ben Sturmfels for the patch.
2012-08-21 17:38:16 -04:00
Tim Graham 3fd89d9903 Fixed #14885 - Clarified that ModelForm cleaning may not fully complete if the form is invalid.
Thanks Ben Sturmfels for the patch.
2012-08-21 17:32:53 -04:00
Michael Johnson 32ffcb21a0 Fixed #17069 -- Added log filter example to docs.
Added an example of filtering admin error emails (to exclude
UnreadablePostErrors) to the docs.
2012-08-21 09:01:11 -04:00
Alex Gaynor 831f2846dd Fixed #18819 -- fixed some typos in the auth docs 2012-08-20 14:27:28 -07:00
Aymeric Augustin 1288572d92 Made an example more readable in the URLs docs. 2012-08-20 18:23:17 +02:00
Aymeric Augustin 4e82d61400 Added links in URLs doc for consistency. 2012-08-20 15:02:25 +02:00
Tim Graham 514a0013cd Fixed #17180 - Emphasized the need to load the i18n template tag in each template that uses translations. Thanks stefan.freyr for the suggestion and buddylindsey for the draft patch. 2012-08-19 18:46:46 -04:00
Aymeric Augustin 7631fb8f37 Clarified a sentence in the Python 3 docs.
Thanks dstufft for the report.
2012-08-19 21:21:53 +02:00
Marc Tamlyn 268fa9631e Fixed indentation in the Python3 docs 2012-08-19 20:04:52 +02:00
Aymeric Augustin 500fe9c639 [py3] Wrote Django-specific porting tips
and extended the existing Python 3 documentation.
2012-08-19 16:30:07 +02:00
Aymeric Augustin 4c1286cf78 [py3] Added compatibility import of thread/_thread
This commit fixes the auto-reload of the development server.

I should have done that change in ca07fda2.
2012-08-18 10:56:56 +02:00
Preston Holmes e437dd1d6b Update docs/topics/class-based-views/index.txt
View class does not have a render_to_response method - so does not make sense for this mixin
2012-08-17 17:29:46 -07:00
Tim Graham b1f18e95a5 Fixed #17183 - Added a note regarding LocaleMiddleware at the top of the i18n docs. Thanks krzysiumed for the patch. 2012-08-16 18:16:19 -04:00
Florian Apolloner d2975718fe Consistenly use _ as alias for ugettext_lazy in the i18n docs. 2012-08-13 16:54:13 +02:00
Aymeric Augustin 031896c510 [py3] Explained @python_2_unicode_compatible usage 2012-08-12 15:22:33 +02:00
Tim Graham cb38fd9632 Fixed #17680 - Clarified when logging is configured. 2012-08-10 17:35:16 -04:00
Tim Graham eff6ba2f64 Fixed #17016 - Added examples for file uploads in views.
Thanks Tim Saylor for the draft patch and Aymeric Augustin and Claude Paroz for feedback.
2012-08-10 16:19:20 -04:00
Claude Paroz 576ec12f8e [py3] Replaced __nonzero__ by __bool__
Of course, __nonzero__ alias has been kept for Python 2 compatibility.
2012-08-08 15:02:31 +02:00
Aymeric Augustin c5ef65bcf3 [py3] Ported django.utils.encoding.
* Renamed smart_unicode to smart_text (but kept the old name under
  Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
  and smart_bytes under Python 2 (which is backwards compatible).
  Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
  want a str.
2012-08-07 12:00:22 +02:00
Tim Graham 4f3a6b853a Fixed #17053 - Added a note about USE_THOUSAND_SEPARATOR setting to localizations docs.
Thanks shelldweller for the draft patch.
2012-08-06 16:15:09 -04:00
Tim Graham 84c3c9097d Merge pull request #153 from webjunkie/patch-1
Fixed #18110 -- Improve template cache tag documentation
2012-08-04 12:50:42 -07:00
Tim Graham 46589d0c6d Merge pull request #244 from mbrochh/master
Fixed small typo in class based view docs.
2012-08-04 12:29:42 -07:00
Tim Graham 865ff32b84 Fixed #16980 - Misc updates to the auth docs. Thanks Preston Holmes for the patch. 2012-08-04 15:24:40 -04:00