Russell Keith-Magee
e29c010beb
Merge remote-tracking branch 'django/master' into t3011
2012-08-20 13:12:57 +08:00
Russell Keith-Magee
8e3fd703d0
Merged recent changes from trunk.
2012-08-20 13:09:09 +08:00
Simon Meers
30bdf22bc7
Fixed #18799 -- Improved index links for CBV documentation.
...
Thanks anthonyb.
2012-08-20 13:46:36 +10:00
Ramiro Morales
26e0ba07ae
Tweaked SpatiaLite GeoDjango docs.
2012-08-19 22:03:50 -03:00
Tim Graham
3631db88cb
Fixed typo in form wizard docs.
2012-08-19 20:13:09 -04: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
Julien Phalip
cccbb6bff3
Made some minor fixes to the GeoDjango installation guide.
2012-08-19 00:57:48 -07:00
Marc Tamlyn
8d5c11caad
Fixed #3542 -- Add support for changing granularity on ArchiveView.
...
Resolving the concept from a very old ticket in a more class-based-view
manner.
2012-08-18 17:03:57 +01:00
Aymeric Augustin
a120fac65a
Introduced force_bytes and force_str.
...
This is consistent with the smart_* series of functions and it's going
to be used by the next commit.
2012-08-18 16:38:49 +02:00
Marc Tamlyn
f04bb6d798
Fixed #17228 -- params context variable is inconsistent
...
Remove the params variable from the context and just put the variables
in directly.
This had not been committed previously as the original pattern was used
in the functional generic views and we wanted consistency between them,
but django.views.generic.simple.direct_to_template is now gone so we can
do it 'right'.
2012-08-18 15:07:21 +01:00
Marc Tamlyn
212b9826bd
Fixed #14516 -- Extract methods from removetags and slugify template filters
...
Patch by @jphalip updated to apply, documentation and release notes
added.
I've documented strip_tags as well as remove_tags as the difference
between the two wouldn't be immediately obvious.
2012-08-18 15:07:21 +01:00
Marc Tamlyn
58683e9c82
Fixed #16744 -- Class based view should have the view object in the context
...
Updated the most recent patch from @claudep to apply again and updated
the documentation location.
2012-08-18 15:07:21 +01:00
Aymeric Augustin
547b181046
[py3] Ported django.utils.safestring.
...
Backwards compatibility aliases were created under Python 2.
2012-08-18 16:04:06 +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
Aymeric Augustin
0d1653395b
Merge pull request #282 from ptone/patch-1
...
Corrected docs on setup of JSONResponseMixin example
2012-08-18 01:30:10 -07:00
Aymeric Augustin
4da1d0fd65
Added a warning about the {% url %} syntax change
...
at the point where it bites most beginners.
Refs #18787 , #18762 , #18756 , #18723 , #18705 , #18689 and several duplicates.
2012-08-18 09:58:42 +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
6086f7356d
Merge pull request #271 from morty/patch-1
...
Fixed doc comment in django.contrib.admin example to match the code
2012-08-17 08:20:43 -07:00
Tim Graham
2a36a1a071
Fixed #18696 - Clarified WizardView heading; thanks sergzach.
2012-08-17 11:06:38 -04:00
Tim Graham
4eaf73d7bc
Merge pull request #261 from issackelly/cbv-full-list
...
Create headings and expand CBV docs so that the "Built-In CBV" docs include a full list.
2012-08-17 07:57:39 -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
Tim Graham
2079b730f1
Fixed #18223 - Corrected default transaction behavior in postgresql docs.
...
Thanks philipn for the report and mateusgondim for the patch.
2012-08-16 18:15:19 -04:00
Simon Meers
d1d514af04
Marked up a few raw values in the settings documentation.
2012-08-16 10:13:28 +10:00
Piet Delport
e38112d882
Fixed #18759 -- updated SECRET_KEY documentation
...
Document SECRET_KEY becoming required in 1.5.
Also expand the description slightly, and add a more prominent warning
about the security implications of running with an exposed SECRET_KEY.
2012-08-16 09:47:55 +10:00
Tom Mortimer-Jones
383da13785
Fixed comment to match the code
2012-08-15 19:41:16 +02:00
Florian Apolloner
d2975718fe
Consistenly use _ as alias for ugettext_lazy in the i18n docs.
2012-08-13 16:54:13 +02:00
Andrei Antoukh
99321e30ce
Fixed #18306 -- Made deferred models issue update_fields on save
...
Deferred models now automatically update only the fields which are
loaded from the db (with .only() or .defer()). In addition, any field
set manually after the load is updated on save.
2012-08-12 22:39:27 +03:00
Aymeric Augustin
031896c510
[py3] Explained @python_2_unicode_compatible usage
2012-08-12 15:22:33 +02:00
Aymeric Augustin
4e68e86153
[py3] Deprecated StrAndUnicode.
...
This mix-in is superseded by the @python_2_unicode_compatible decorator.
2012-08-12 14:44:41 +02:00
Aymeric Augustin
a0a0203a39
[py3] Added python_2_unicode_compatible decorator.
2012-08-12 14:44:40 +02:00
Florian Apolloner
9e7b5ba50f
Removed missplaced label in the docs.
2012-08-12 12:43:05 +02:00
Martijn Vermaat
140179c770
Fix link to Gunicorn website in deployment howto.
2012-08-12 12:37:55 +02:00
Florian Apolloner
4d9e4c64f1
Fixed #18698 -- Configure latex to support '≥' in the docs.
...
Thanks to simonb for the report and the initial patch.
2012-08-11 21:48:11 +02:00
Issac Kelly
060ac8e711
Create headings and expand CBV docs so that the "Built-In CBV" docs include a complete list.
2012-08-10 23:07:15 -07: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
Tim Graham
7275576235
Clarified thread safety note in class based views; thanks rafadura for the patch.
2012-08-09 18:22:30 -04:00
James Bennett
7731cc8689
Fix #18062 : Document best practices for choices in model fields.
2012-08-08 12:49:28 -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
James Bennett
50c41e77e8
Put all the security-related notes in the same notice box.
2012-08-07 16:28:12 -04:00
James Bennett
5c3bc25598
And link security policies from documentation index.
2012-08-07 16:26:37 -04:00
James Bennett
483fb75049
Link security policies from internals index.
2012-08-07 16:25:21 -04:00
James Bennett
1ef1bceb3b
Add new security-policy documentation.
...
This formally describes our policies on reporting, notification and
disclosure of security issues, and provides a detailed explanation of
our full security-response process, for reference purposes.
2012-08-07 16:06:34 -04: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
fa3f0aa021
Merge pull request #252 from MichaelBlume/patch-1
...
Grammar fix in 1.5 release notes.
2012-08-06 18:06:21 -07:00
Michael Blume
c8780d9f4d
change "has now" -> "now has" in 1.5 release notes
...
I believe this is standard.
2012-08-06 14:28:58 -07: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