Commit Graph

4650 Commits

Author SHA1 Message Date
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
Aymeric Augustin 9a3026a920 Fixed a rst error introduced in f2abfe1e. 2012-08-05 22:53:09 +02:00
Tim Graham a04f68b15d Merge pull request #233 from rafikdraoui/modeladmin-doc
Updated example of customized ModelAdmin in documentation for 1.4
2012-08-05 10:21:14 -07:00
Julien Phalip 19642a7a09 Fixed some typos on the documentation's index page. 2012-08-04 18:19:25 -07:00
Angeline Tan 5d4f993bb1 Moved a note about django-admin.py errors from Tutorial Part 1 to a new FAQ Troubleshooting page. This is to avoid confusion for beginners. 2012-08-04 17:27:57 -07:00
Julien Phalip 197863523a Restructured the documentation's index page and added some introductory sentences to each section. 2012-08-04 16:42:33 -07:00
Julien Phalip 9ea4dc90b9 Small improvement to the `contrib.messages` doc introduction. 2012-08-04 15:46:15 -07:00
Florian Apolloner 62ae711cec Added a missing space to the description of the `cut` filter. 2012-08-04 23:58:31 +02:00
Alex Gaynor 5f9b2be559 Merge pull request #210 from pydanny/ticket_18632
Ticket 18632 Cleanup of CBV edit/edit mixin documentation.
2012-08-04 13:16:24 -07:00
Daniel Greenfeld 1fefd91e1e For #210, cleaned up text and formatting. 2012-08-04 13:01:40 -07: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
Claude Paroz 542c20b382 Fixed #18713 -- Fixed custom comment app name in comments docs
Thanks Pratyush for the report.
2012-08-04 17:38:18 +02:00
Claude Paroz 121fd109de Fixed #5524 -- Do not remove cleaned_data when a form fails validation
cleaned_data is no longer deleted when form validation fails but only
contains the data that did validate.
Thanks to the various contributors to this patch (see ticket).
2012-08-04 14:22:23 +02:00
Simon Meers 10f979fd92 Fixed #18700 -- Added URL reversal for i18n set_language view. 2012-08-04 20:57:12 +10:00
Tim Graham b496be331c Fixed #15932 - Documented how to supress multiple reverse relations to the same model.
Thanks Claude Paroz for the patch.
2012-08-03 16:27:45 -04:00
Aymeric Augustin d01eaf7104 [py3] Removed uses of sys.maxint under Python 3.
Also fixed #18706: improved exceptions raised by int_to_base36.
2012-08-03 18:51:28 +02:00
Aymeric Augustin 5aec69ed29 Documented the trick used in 9908201d7f. 2012-08-03 15:40:29 +02:00
Tim Graham 083a3a4e39 Fixed #13904 - Documented how to avoid garbage collection messages in GIS.
Thanks Claude Peroz for the patch.
2012-08-03 05:17:52 -04:00
Tim Graham 2a16eb0792 Fixed #17704 - Updated the StackedInline section in Tutorial 2; thanks xbito for the draft patch. 2012-08-02 19:22:49 -04:00
Tim Graham 07e10fbe9f Fixed #16941 - Clarified naturaltime output when the time is more than a day old.
Thanks antoviaque for the patch.
2012-08-02 07:54:07 -04:00
Tim Graham 39541be3bc Fixed #18581 - Updated admin actions screenshots. Thanks Kevin London. 2012-08-02 07:52:16 -04: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
Simon Meers c59fff707a Reinstated Pinax link that was still in use by others. 2012-08-02 20:27:53 +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
Justin Bronn c0748a621c Updated my bio. 2012-07-29 16:53:56 -07:00
Tim Graham 690ed57946 Fixed #18476 - Added use of {% url %} tag to tutorial.
Thanks Claude Paroz for the patch.
2012-07-29 18:14:26 -04:00
Tim Graham 07d70e9b26 Fixed #18656 -- Fixed LocaleMiddleware link; thanks mitar for the report. 2012-07-28 13:31:41 -04:00
Tim Graham 00d5e632fa Fixed #18630 -- Updated version in docs/intro/install.txt; thanks Kevin London. 2012-07-28 13:17:33 -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
Rafik Draoui 04e8ef5a83 Updated example of customized ModelAdmin in documentation for 1.4
The change_view method of django.contrib.admin.ModelAdmin takes an
extra `form_url` argument in Django 1.4.
2012-07-25 21:33:38 +01:00
Florian Apolloner 7d06f975fe Fixed #18614 -- Added missing imports in code samples. 2012-07-25 22:32:53 +02:00
Florian Apolloner 51a010135c Merge pull request #220 from dirn/staticfiles-docs-typo
Fix typo in staticfiles app documentation
2012-07-25 13:20:44 -07: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 5ee8c3ef0c Merge pull request #230 from pjdelport/cleanup
Cleanup
2012-07-25 13:07:10 -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
Alex Gaynor c4be14bd32 Merge pull request #232 from yohanboniface/ticket18667
Ticket 18667: fix typo in CBV doc
2012-07-25 12:56:08 -07:00
James Bennett 9d246e0f9f Merge pull request #231 from kevin1024/master
Documentation fix - Change the word "brackets" to "parentheses"
2012-07-25 12:54:09 -07:00
Aymeric Augustin 69f4856f23 Fixed a typo in the admin reference docs.
Thanks Yohan Boniface for the report.
2012-07-25 10:57:30 +02:00
Yohan Boniface 206c248f1e Ticket 18667: fix typo in CBV doc 2012-07-25 10:44:43 +02:00
nklas c7ac44e64b Update docs/topics/signals.txt
Fixed a typo.
2012-07-25 13:20:26 +07:00
Kevin McCarthy c3a05d8794 Changed the word "brackets" to "parentheses"
I want to change the word "brackets" to "parentheses" because when I think
of brackets, I think of [], and when I think of parentheses, I think of (),
and when I originally read this, I found the word confusing.
2012-07-24 16:55:08 -10:00
Ramiro Morales 50837434db Clarified default name of M2M relationship DB table. 2012-07-24 22:44:28 -03:00
Piet Delport f1128e5474 Fix typo. 2012-07-25 01:21:16 +02: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
nklas 6006c1f076 Fixed a small typo. 2012-07-25 01:45:56 +07: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