Commit Graph

1176 Commits

Author SHA1 Message Date
Aymeric Augustin ebd2598596 Removed django.contrib.markup. 2012-12-29 21:59:07 +01:00
Aymeric Augustin f27a4ee327 Removed django.contrib.localflavor.
Each localflavor lives on as a separate app.
2012-12-29 21:59:06 +01:00
Tim Graham 067505ad19 Fixed broken links, round 4. refs #19516 2012-12-29 15:54:33 -05:00
Preston Holmes 11ded967c4 Fixed #19498 -- refactored auth documentation
The auth doc was a single page which had grown unwieldy.
This refactor split and grouped the content into sub-topics.
Additional corrections and cleanups were made along the way.
2012-12-28 11:06:12 -08:00
Tim Graham b3a8c9dab8 Fixed broken links, round 3. refs #19516 2012-12-26 19:07:22 -05:00
Tim Graham f56f6cfa58 Fixed links to DATABASE ENGINE setting. refs #19516 2012-12-24 15:38:05 -05:00
Ramiro Morales d19109fd37 Fixed #19497 -- Refactored testing docs.
Thanks Tim Graham for the review and suggestions.
2012-12-21 21:59:06 -03:00
Tim Graham 52a2588df6 Fixed #19506 - Remove 'mysite' prefix in model example.
Thanks Mike O'Connor for the report.
2012-12-21 15:52:06 -05:00
Tim Graham 31f49f1396 Fixed #19442 - Clarified that raw SQL must be committed.
Thanks startup.canada for the suggestion.
2012-12-18 08:10:12 -05:00
Tim Graham 7df03268a4 Fixed #17312 - Warned about database side effects in tests.
Thanks jcspray for the suggestion.
2012-12-18 08:03:47 -05:00
Tim Graham 72a6ac568d Fixed #19279 - Clarified order of database setup and Django install.
Thanks colinnkeenan for the suggestion.
2012-12-16 15:42:01 -05:00
Aymeric Augustin dbdd253860 Replaced the test case hierarchy schema with a vector version.
The OmniGraffle source file is included for future use.
2012-12-16 21:07:12 +01:00
Aymeric Augustin bf14aed3cc Added PDF version of SVG file for latexpdf builds.
Thanks Tim Graham for reporting this issue and testing the fix.
2012-12-16 19:42:53 +01:00
Russell Keith-Magee 47e1df896b 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.
2012-12-15 22:44:47 +08:00
Russell Keith-Magee bd414aed01 Fixed #19472 -- Documented the testing requirements and tools for custom User models.
Thanks to gcc for the report.
2012-12-15 22:44:47 +08:00
Russell Keith-Magee 1b646e656e 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.
2012-12-15 22:44:46 +08:00
Tim Graham 3984ccbcec Merge pull request #585 from blongden/clarify_php_refs
Removed poor PHP references
2012-12-14 16:33:16 -08:00
Aymeric Augustin a001f3c31e Fixed #2304 -- Documented TRANSACTIONS_MANAGED. 2012-12-14 21:15:48 +01:00
Ben Longden 55a2d5b577 Removes PHP references 2012-12-13 13:20:47 +00:00
Anssi Kääriäinen 088d3bc2f8 Fixed #19462 -- Made assertQuerysetEqual detect undefined ordering
If there are more than one values to compare against and the qs isn't
ordered then assertQuerysetEqual will raise a ValueError.
2012-12-13 13:33:11 +02:00
Tim Graham 6cad5f212a Fixed #19461 - Linked to psycopg in topics/install.txt
Thanks Chris Jerdonek for the suggestion.
2012-12-11 18:43:37 -05:00
Florian Apolloner 27560924ec Fixed a security issue in get_host.
Full disclosure and new release forthcoming.
2012-12-10 22:11:40 +01:00
Aymeric Augustin be9f2919e0 Edited the middleware doc for completeness, clarity, and consistency. 2012-12-09 22:30:01 +01:00
Aymeric Augustin ae8e97384b Fixed #12502 -- Improved middleware diagram. 2012-12-09 21:13:26 +01:00
Claude Paroz 8248d14029 Removed US localflavor-specific tests from core
Also fixes #9045.
2012-12-08 21:07:59 +01:00
Val Neekman cacafe89d0 fix a spelling error in docs 2012-12-02 16:26:00 -05:00
Tim Graham 008e625c66 Fixed #19400 - Typo in docs/topics/auth.txt 2012-11-30 15:10:52 -05:00
Tim Graham ba2adc9c05 Fixed #19352 - Added an example in the QuerySet docs.
Thanks colinkeenan for the suggestion.
2012-11-27 18:21:55 -05:00
Russell Keith-Magee fdb5c98d7e Fixed #19218 -- Added documentation note on limitations of signals with custom User models.
Thanks to kunitoki@gmail.com for the report.
2012-11-24 13:53:44 +08:00
Aymeric Augustin 5c81e9de0f Negligible style fix in docs. 2012-11-23 20:40:42 +01:00
WoLpH eabb44417c changed if statement to a slightly cleaner/less confusing variant 2012-11-22 22:29:39 +01:00
Tim Graham 0e3690d230 Fixed #18974 - Warned against using models.permalink
Thanks dstufft for the draft patch.
2012-11-22 16:08:51 -05:00
Aymeric Augustin a026e480da Fixed #16039 -- Made post_syncdb handlers multi-db aware.
Also reverted 8fb7a90026. Refs #17055.
2012-11-22 20:53:59 +01:00
Jannis Leidel 3fb83729b9 Merge branch 'ticket_19325' of https://github.com/hannesstruss/django into hannesstruss-ticket_19325 2012-11-22 10:05:08 +01:00
Tim Graham e2b1808196 Fixed #19335 - Typo and cleanups in docs/topics/class-based-views/index.txt 2012-11-21 19:06:17 -05:00
Hannes Struss f9891f2087 Fixed #19325 - Made email backend of AdminEmailHandler configurable 2012-11-20 11:23:12 +01:00
Jannis Leidel 1520748dac Fixed #2550 -- Allow the auth backends to raise the PermissionDenied exception to completely stop the authentication chain. Many thanks to namn, danielr, Dan Julius, Łukasz Rekucki, Aashu Dwivedi and umbrae for working this over the years. 2012-11-17 20:24:54 +01:00
Alex Gaynor 1e34fd3c03 fixed a broken link in the docs 2012-11-13 14:48:23 -08:00
David Cramer 54fbe6ce5f Correct link to Sentry
django-sentry is no longer maintained, and sentry is the replacement.
2012-11-13 13:51:50 -08:00
Aymeric Augustin 00ff69a827 Fixed #19283 -- Fixed typo in imports in CBV docs. 2012-11-13 20:46:29 +01:00
Aymeric Augustin 4c5cea7073 Merge pull request #218 from mgrouchy/ticket_18582
Fixed #18582 -- Added a no-op close to BaseCache
2012-11-11 07:18:45 -08:00
Tim Graham e8f696097b Fixed #19161 - Added missing clean_password method in custom user docs
Thanks DavidW for the report.
2012-11-06 19:44:49 -05:00
Tim Graham 620e0bba49 Fixed #19154 - Noted commit_manually requires commit/rollback for reads
Thanks als for the report.
2012-11-06 17:47:10 -05:00
Tim Graham d3fd8a1512 Fixed #15591 - Clarified interaction between ModelForm and model validation. 2012-11-05 18:24:28 -05:00
Claude Paroz 4e8d9524c6 Fixed #6234 -- Removed obsolete note about json and ensure_ascii
Thanks aaron at cellmap.ca for the report.
2012-11-03 23:53:51 +01:00
Aymeric Augustin fc10418fba Fixed #18963 -- Used a subclass-friendly pattern
for Python 2 object model compatibility methods.
2012-11-03 22:07:35 +01:00
Markus Zapke-Gründemann 0546794397 Fixed #19230 -- Extended the handler403 documentation.
Added a paragraph on how to use the PermissionDenied exception to create a 403
response and use handler403.
2012-11-03 17:18:47 +01:00
Tim Graham 07361d1fd6 Fixed #19167 - Added a warning regarding module-level database queries
Thanks Daniele Procida for the patch.
2012-11-02 18:19:45 -04:00
Tim Graham feaf9f279a Fixed #15361 - Documented performance considerations for QuerySet.get()
Thanks mmcnickle for the patch.
2012-11-02 17:58:24 -04:00
Florian Apolloner 0d8432da55 Documented minimal python 3.2 version. 2012-11-02 10:51:10 +01:00
Aymeric Augustin f975c4857d Fixed #19225 -- Typo in shortcuts docs.
Thanks SunPowered for the report.
2012-11-02 09:29:55 +01:00
Tim Graham af7ea808d8 Added WizardView.file_storage exception message and docs
Thanks Danilo Bargen for the patch.
2012-11-01 16:14:51 -04:00
Aymeric Augustin 146ed13a11 Fixed #17083 -- Allowed sessions to use non-default cache. 2012-10-31 09:46:16 +01:00
Brent O'Connor d55c54a5da The timeout variable wasn't defined, which was a little confusing. 2012-10-30 16:19:31 -07:00
Claude Paroz 9a02851340 Fixed #17744 -- Reset default file storage with setting_changed signal 2012-10-30 22:23:28 +01:00
Preston Holmes 4ea8105120 Fixed #19061 -- added is_active attribute to AbstractBaseUser 2012-10-28 23:04:03 -07:00
Aymeric Augustin 5fec97b9df 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.
2012-10-28 09:19:38 +01:00
Aymeric Augustin cd17a24083 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).
2012-10-27 23:15:45 +02:00
Claude Paroz fc2681b22b Fixed #17787 -- Documented reset caches by setting_changed signal 2012-10-27 21:55:50 +02:00
Florian Apolloner b7d81715dc Removed a redundant colon in the query docs.
Thanks to Berker Peksag for the patch.
2012-10-27 21:21:33 +02:00
Aymeric Augustin 83ba0a9d4b Fixed #18978 -- Moved cleanup command to sessions.
This removes a dependency of 'core' on 'contrib'.
2012-10-27 18:31:00 +02:00
Claude Paroz 90c7656466 Fixed #19191 -- Corrected a typo in CustomUser docs
Thanks spleeyah for the report.
2012-10-26 10:23:33 +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