Russell Keith-Magee
d84749a0f0
Merge remote-tracking branch 'django/master' into t3011
2012-09-26 18:37:04 +08:00
Tim Graham
7c11b1a470
Merge pull request #391 from reverie/patch-1
...
Fixed typo in context_processors.auth
2012-09-26 01:13:09 -07:00
Russell Keith-Magee
531e7715da
Merged recent trunk changes.
2012-09-26 07:09:23 +08:00
Yohan Boniface
5a1bf7eccb
Fix little typo in cache documentation
2012-09-25 17:08:07 +02:00
Andrew Badr
29cd3d6c01
Fix docs for context_processors.auth
...
Copy said it created three context variables, but only lists two. ("messages" was removed.)
2012-09-24 17:14:11 -07: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
Russell Keith-Magee
29d1abbe35
Merge remote-tracking branch 'django/master' into t3011
2012-09-24 07:49:46 +08:00
Aymeric Augustin
98b6ce60f4
Made a version condition less confusing.
...
Fixed #18762 (again).
2012-09-23 20:18:29 +02:00
Russell Keith-Magee
e2b6e22f29
Modifications to the handling and docs for auth forms.
2012-09-23 17:53:05 +08:00
Russell Keith-Magee
98aba856b5
Improved error handling and docs for get_user_model()
2012-09-23 15:28:57 +08:00
Russell Keith-Magee
0229209c84
Merged recent Django trunk changes.
2012-09-23 14:50:11 +08: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
Aymeric Augustin
822cfce3df
Fixed #18951 -- Formatting of microseconds.
...
Thanks olofom at gmail com for the report.
2012-09-22 12:02:21 +02:00
Aymeric Augustin
baa33cd8fa
Fixed #16218 -- date_list order in generic CBVs.
...
Thanks nnrcschmdt for the report and bpeschier for the initial
version of the patch.
2012-09-22 11:47:34 +02:00
Dan Loewenherz
69ff1b7390
Fixed #16835 -- add groups to auth.user admin list_filter
2012-09-22 00:16:22 -07:00
Preston Holmes
2b1ae4dbd2
Fixed #19008 typo in signals docs
2012-09-21 16:22:50 -07: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
Alex Gaynor
e06b54391d
Removed an excess colon. Thanks to jMyles for the patch.
2012-09-20 13:49:26 -07:00
Ian Clelland
2315f1a2ee
Add documentation for get_caches function
2012-09-20 12:07:34 -07:00
Claude Paroz
89136b2725
Fixed #16577 -- Added a map_creation block in openlayers.js template
2012-09-20 10:31:37 +02:00
Claude Paroz
3ae397a98c
Added a note about GEOS support for 3D/4D WKT notation
...
See also http://trac.osgeo.org/geos/ticket/347
2012-09-20 09:40:18 +02:00
Tim Graham
0fdfcee257
Fixed #15325 - Added a link to RelatedManager in the ManytoManyField docs; thanks jammon for the suggestion.
2012-09-19 18:00:14 -04: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
1360bd4186
Fixed #13586 - Added an example of how to connect a m2m_changed signal handler.
2012-09-19 15:09:49 -04:00
Carl Meyer
4e9a74b81d
Revert "Fixed #16865 -- Made get_or_create use read database for initial get query."
...
Thanks to Jeremy Dunck for pointing out the problem with this change. If in a
single transaction, the master deletes a record and then get_or_creates a
similar record, under the new behavior the get_or_create would find the record
in the slave db and fail to re-create it, leaving the record nonexistent, which
violates the contract of get_or_create that the record should always exist
afterwards. We need to do everything against the master here in order to ensure
correctness.
This reverts commit 901af86550
.
2012-09-19 11:15:12 -06:00
Carl Meyer
901af86550
Fixed #16865 -- Made get_or_create use read database for initial get query.
...
Thanks Rick van Hattem for the report and trbs for the patch.
2012-09-19 10:06:53 -06:00
Collin Anderson
b771bcc7b4
document changes for YearArchiveView.
2012-09-18 11:06:10 -04:00
Preston Holmes
b1b32b2074
Added myself as a committer.
2012-09-17 22:02:16 -07: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
Florian Apolloner
23d0136314
Merge branch 'lotheac-fix_uploaded_file_exec'
2012-09-17 22:54:26 +02:00
Florian Apolloner
e8c6aff3bf
Fixed #18947 -- Don't make uploaded files executeable by default.
...
Thanks to Lauri Tirkkonen for the patch.
2012-09-17 22:53:10 +02: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
Russell Keith-Magee
280bf19e94
Merge remote-tracking branch 'django/master' into t3011
2012-09-16 18:16:49 +08:00
Florian Apolloner
935a8635c2
Merge pull request #372 from ptone/patch-2
...
Clearer wording for defer docs
2012-09-16 02:45:44 -07:00
Russell Keith-Magee
dfd72131d8
Added protection against proxying swapped models.
2012-09-16 15:54:30 +08:00
Russell Keith-Magee
abcb027190
Cleanup and documentation of AbstractUser base class.
2012-09-16 15:11:10 +08:00
Russell Keith-Magee
fd8bb4e3e4
Documentation improvements coming from community review.
2012-09-16 14:20:14 +08:00
Russell Keith-Magee
b441a6bbc7
Added note about backwards incompatible change to admin login messages.
2012-09-16 13:41:33 +08:00
Preston Holmes
8d75b1176f
Clearer wording for defer docs
2012-09-15 14:24:01 -07:00
Camilo Nova
17149496a0
Fixes docs typo
2012-09-15 15:45:13 -05:00
Russell Keith-Magee
579f152e4a
Merge remote-tracking branch 'django/master' into t3011
2012-09-15 20:18:37 +08:00
Russell Keith-Magee
918497218c
Deprecate AUTH_PROFILE_MODULE and get_profile().
2012-09-15 20:18:19 +08:00
Tim Graham
93e6733e4c
Fixed #18131 - Documented ContentTypeManager.get_for_id; thanks sir_sigurd for the report.
2012-09-15 08:15:54 -04:00
Russell Keith-Magee
334cdfc1bb
Added release notes for new swappable User feature.
2012-09-15 20:00:12 +08: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
553583958d
Added an example of using a form wizard with different templates; thanks Lorin Hochstein for the patch.
2012-09-15 07:16:07 -04:00
Tim Graham
e5f8fe27ac
Removed reference to note removed in a78dd109e6c81c49e90e36e9b793bad67c46c23c; refs #15552
2012-09-15 06:41:58 -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
Claude Paroz
65793d714c
Used ST_AsText for testing PostGIS raw query
...
AsText will not be supported in further versions of PostGIS (>=2).
2012-09-15 12:02:28 +02:00