19526563b5
Merge recent changes from master.
2012-09-09 08:22:26 +08:00
2c5e833a30
Corrected admin_views tests following removal of the email fallback on admin logins.
2012-09-09 07:53:46 +08:00
c4aa26a983
Internal refactoring; moving LOOKUP_SEP up one level.
...
In an ideal world, nothing except django.db.models.query should have to
import stuff from django.models.sql.*. A few things were needing to get
hold of sql.constants.LOOKUP_SEP, so this commit moves it up to
django.db.models.constants.LOOKUP_SEP.
There are still a couple of places (admin) poking into sql.* to get
QUERY_TERMS, which is unfortunate, but a slightly different issue and
harder to adjust.
2012-09-08 19:51:36 -04:00
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
518c582966
Fixed #15906 - Documented HEAD method in CBVs; thanks zsiciarz for the patch.
2012-09-08 18:45:02 -04:00
72ca530af5
Fixed typo in commit for #15730 ; thanks Bruno Renié for the catch.
2012-09-08 17:34:22 -04:00
67dceeef44
Remove a couple unused imports.
2012-09-08 14:30:11 -06:00
307706d082
Fixed #18545 -- Make the 'no DJANGO_SETTINGS_MODULE' error message more useful.Thanks Nick Coghlan for the report, and Malcolm Tredinnick for review.
2012-09-08 14:26:33 -06:00
c26dd4f154
Merge pull request #363 from ubernostrum/multidb-examples-18657
...
Ticket 18657: Fix inconsistent DB names in router example.
2012-09-08 13:16:16 -07:00
5c5226a520
Fix typo: Non -> None
2012-09-08 16:14:13 -04:00
408c10e541
Untabify multi-db docs.
2012-09-08 16:08:01 -04:00
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
d7853c55ed
Removed warning check in test_load_overlong_key
...
Some backends issue a warning here, others not. This is not the primary
goal of the test, so the assertion about the warning has been removed.
Thanks Carl Meyer for noticing the issue and suggesting the fix.
2012-09-08 21:31:46 +02:00
3bdb65dc59
Updated print statements to work with py3; thanks Claude Paroz noting this.
2012-09-08 15:15:10 -04:00
4754f122dd
Moved the admin inline JS to new JS files for cleanliness.
2012-09-08 15:09:37 -04:00
6e2bb344e4
Fixed #18478 - Documented how to use a mutable default in a model field.
2012-09-08 14:52:17 -04:00
20ee727ac9
Fixed #18628 - Added methods/attributes to CBV docs. Thanks Daniel Greenfeld!
2012-09-08 14:11:45 -04:00
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
b139cfc0f7
Fixed #15730 - Documented the as_view() method for CBVs.
2012-09-08 13:19:58 -04:00
3c27344b45
Merge pull request #361 from koniiiik/py3kdoc
...
Fixed a typo in the Python 3 compatibility docs.
2012-09-08 10:14:48 -07:00
20d1892491
Added conditional skips for all tests dependent on the default User model
2012-09-09 01:00:37 +08:00
86e149ae05
Fixed a typo in the Python 3 compatibility docs.
2012-09-08 18:54:33 +02:00
571698997f
fixing modelforms example code, ticket #18832
2012-09-08 12:30:41 -04:00
7207327dd3
Updated docs for dates generic views.
...
Fixes #18245 . Refs #3542 .
2012-09-08 12:22:39 -04:00
3da43c1111
Fixed #18054 -- Deprecated contrib.markup. Thanks to simukis for the initial patch.
2012-09-08 12:13:46 -04:00
40ea8b8882
Added documentation for REQUIRED_FIELDS in custom auth.
2012-09-08 23:47:02 +08:00
617d077f1f
Merge pull request #357 from tswicegood/fix-list-attr
...
Removed admin's swallowing of AttributeError (#16655 , #18593 , #18747 )
2012-09-08 08:37:40 -07:00
ccd1bb0d81
Remove Admin's swallowing of AttributeError ( #16655 , #18593 , #18747 )
...
During the new-admin changes, catching of AttributeError was added to
the admin. This patch removes that as it's no longer possible to add a
value to a ModelAdmin that is not available. Adding an attribute that
can not be called causes an ImproperlyConfigured exception to be raised.
2012-09-08 11:20:05 -04:00
e6aaf65970
Added first draft of custom User docs.
...
Thanks to Greg Turner for the initial text.
2012-09-08 23:20:02 +08:00
d823bb790d
Fixed #17156 -- Added documentation examples for exists()
...
Thanks mrmagooey for the draft patch.
2012-09-08 11:19:49 -04:00
e69348b4e7
Avoided mixing dates and datetimes in the examples.
...
Refs #16023 .
2012-09-08 11:00:04 -04:00
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
b036baa990
Merge pull request #354 from shabda/ticket_18928
...
Fixed #18928 - Tightened language in docs/README
2012-09-08 03:45:41 -07:00
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
09a99714c0
Moved get_primary_key_column implementation to base
...
Refs #17574 .
2012-09-08 10:24:13 +02:00
8198a1923e
Fixed #18928 . Tightened language in docs/README.
2012-09-08 11:11:37 +05:30
3622be42b0
Updated the Ubuntu installation section for 12.04 release.
2012-09-07 18:08:57 -07:00
ce53a1d0bf
Clarified the messages documentation.
...
* Stated upfront that the messages framework is enabled by default.
* Explained why FallbackStorage, despites its unattractive name, is the
default and likely the most efficient message storage class.
Thanks Jeremy Dunck for the review.
Closes #17026 (again).
2012-09-07 19:59:00 -04:00
fa8fb2b383
Fixed #18490 - Updated DateField input formats; thanks dloewenherz for the draft patch.
2012-09-07 19:49:38 -04:00
4e1fd38bd6
Fixed #18781 -- Reduced max session cookie size.
2012-09-07 19:24:02 -04:00
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
9b07b5edeb
Fixed #18916 -- Allowed non-ASCII headers.
...
Thanks Malcolm Tredinnick for the review.
2012-09-07 19:08:57 -04:00
1d235b3914
Merge pull request #351 from 1ntrud3r/patch-1
...
Remove unused imports in tutorial 4. refs #18915
2012-09-07 15:29:42 -07:00
499e71eb2e
Merge pull request #341 from nmartini/master
...
Updated text in tutorial 3 regarding removing unused import; refs #18915
2012-09-07 15:27:29 -07:00
2649cb8ff3
Fixed typo from 7435cc01.
...
Thanks kmike.
2012-09-07 17:37:08 -04:00
7435cc0167
Updated install docs to reflect Python 3 status.
...
Closes #17452 .
2012-09-07 17:12:11 -04:00
b865009d41
Fixed #12397 -- allow safe_join to work with the root file system path, which means you can have your root template or file upload path at this location. You almost certainly don't want to do this, except in *very* limited sandboxed situations.
2012-09-07 16:49:22 -04:00
e78f2f6a63
remove unused import in tutorial 4 addition to #18915 (closed)
...
After submitting ticket #18915 , I noticed 2 additional occurrences of the issue.
2012-09-07 23:26:37 +03:00
3a10bcc917
Document ``six.assertRaisesRegex``.
2012-09-07 15:51:22 -04:00
5999eb42eb
Removed another usage of the bear "except:" (rawr!).
2012-09-07 15:34:48 -04:00
Russell Keith-Magee
Malcolm Tredinnick
Carl Meyer
Tim Graham
James Bennett
Claude Paroz
Travis Swicegood
Michal Petrucha
Nick Martini
Aymeric Augustin
Preston Holmes
Travis Swicegood
Shabda Raaj
Justin Bronn
Alex Gaynor
Enrico Ehrhardt