1
0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Commit Graph

1276 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
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
Simon Meers
10f979fd92 Fixed #18700 -- Added URL reversal for i18n set_language view. 2012-08-04 20:57:12 +10:00
Aymeric Augustin
5aec69ed29 Documented the trick used in 9908201d7f. 2012-08-03 15:40:29 +02:00
Martin Brochhaus
6f229d2d7a Update docs/topics/class-based-views/index.txt
Fixed a small typo:

"We can use create" should be "We can create"
2012-08-02 19:29:19 +08:00
Simon Meers
d7816c563b Fixed #18472 - Added warning regarding set_language / i18n_patterns. 2012-08-02 20:45:55 +10:00
Tim Graham
ebbc414d17 Fixed #16168 - Added note regarding type requirements when overridng ModelForm fields.
Thanks Pieter Swinkels for the patch.
2012-08-01 07:59:28 -04:00
Tim Graham
964979e8ec Fixed #18122 - Clarified section title regarding applying permissions to generic views. 2012-07-31 16:13:52 -04:00
Tim Graham
8d3e501502 Fixed #17131 - Added per object permission notes to docs.
Thanks dchandek for the suggestion and mateusgondim for the patch.
2012-07-30 18:10:21 -04:00
Aymeric Augustin
ab6cd1c839 [py3] Updated dict-like data structures for Python 3.
The keys/items/values methods return iterators in Python 3, and the
iterkeys/items/values methods don't exist in Python 3. The behavior
under Python 2 is unchanged.
2012-07-25 22:58:48 +02:00
Florian Apolloner
7d06f975fe Fixed #18614 -- Added missing imports in code samples. 2012-07-25 22:32:53 +02:00
Florian Apolloner
4865274bc1 Merge pull request #224 from reclosedev/patch-1
Documentation: Fix link to uWSGI deployment
2012-07-25 13:18:11 -07:00
Alex Gaynor
98c7ad444c Merge pull request #228 from nklas/master
Documentation: Fixed a typo in docs/releases/1.4.txt
2012-07-25 13:06:58 -07:00
nklas
c7ac44e64b Update docs/topics/signals.txt
Fixed a typo.
2012-07-25 13:20:26 +07:00
Ramiro Morales
50837434db Clarified default name of M2M relationship DB table. 2012-07-24 22:44:28 -03:00
Ramiro Morales
f758bdab5e Fixed #18271 -- Changed stage at which TransactionTestCase flushes DB tables.
Previously, the flush was done before the test case execution and now
it is performed after it.

Other changes to the testing infrastructure include:

* TransactionTestCase now doesn't reset autoincrement sequences either
  (previous behavior can achieved by using `reset_sequences`.)
  With this, no implicit such reset is performed by any of the provided
  TestCase classes.

* New ordering of test cases: All unittest tes cases are run first and
  doctests are run at the end.

THse changes could be backward-incompatible with test cases that relied
on some kind of state being preserved between tests. Please read the
relevant sections of the release notes and testing documentation for
further details.

Thanks Andreas Pelme for the initial patch. Karen Tracey and Anssi
Kääriäinen for the feedback and Anssi for reviewing.

This also fixes #12408.
2012-07-24 17:24:16 -03:00
Aymeric Augustin
ebc89a800a Fixed a broken link in the Python 3 docs.
Thanks ptone for the report.
2012-07-22 19:48:10 +02:00
Roman Haritonov
cc65f4ec8d Documentation: Fix link to uWSGI deployment 2012-07-22 18:54:47 +04:00
Aymeric Augustin
00ace01411 [py3] Documented coding guidelines for Python 3. 2012-07-22 10:29:07 +02:00
Aymeric Augustin
8b01909841 [py3] Bundled six for Python 3 compatibility.
Refs #18363.
2012-07-22 09:29:44 +02:00
Mike Grouchy
a2e927b7ed BaseCache now has a no-op close method as per ticket #18582
Also removed the hasattr check when firing request_finished signal for
caches with a 'close' method. Should be safe to call `cache.close`
everywhere now
2012-07-18 14:16:55 -04:00
Anssi Kääriäinen
aeda55e6bf Fixed #3881 -- skip saving session when response status is 500
Saving session data is somewhat likely to lead into error when the
status code is 500. It is guaranteed to lead into error if the reason
for the 500 code is query error on PostgreSQL.
2012-07-16 20:57:55 +03:00
Aymeric Augustin
fb46f243b4 Fixed #18625 -- Removed old-style use of url tag
from the documentation.
2012-07-15 11:19:50 +02:00
Aymeric Augustin
c13a98968e Fixed a misplaced Sphinx reference. 2012-07-14 12:32:39 +02:00
Preston Holmes
18b9dc4154 Fixed #18601 -- Specified that Python minimum version is 2.6.5
This is due to a bug in previous Python 2.6 versions related to
unicode keyword arguments.
2012-07-13 17:33:13 +02:00
Adrian Holovaty
c9a1f9d1fc Merge pull request #197 from StefanKjartansson/master
Fixed typo in docs
2012-07-11 15:05:48 -07:00
mitnk
fe443b11de fixed a typo in timezones docs. 2012-07-11 10:57:26 +08:00
Stefan Kjartansson
5664338e22 typo in "django/docs/topics/python3.txt" 2012-07-10 15:27:50 +00:00
Tim Graham
590de18add Fixed #18577 - Clarified middleware initialization.
Thanks Lukasz Balcerzak for the patch.
2012-07-08 19:26:53 -04:00
Aymeric Augustin
d94cfdcfae Fixed #18589 -- Typo in generic CBV docs.
Thanks cpthomas for the report.
2012-07-07 17:42:04 +02:00
Tim Graham
5d81ad1af1 Fixed #17168 - Noted TransactionMiddleware only works with "default" database alias.
Thanks codeinthehole for the draft patch.
2012-06-30 10:25:51 -04:00