Commit Graph

12942 Commits

Author SHA1 Message Date
Russell Keith-Magee 29d1abbe35 Merge remote-tracking branch 'django/master' into t3011 2012-09-24 07:49:46 +08:00
Russell Keith-Magee 8a527dda13 Ensure sequences are reset correctly in the presence of swapped models. 2012-09-24 07:48:05 +08:00
Claude Paroz 54c81a1c93 [py3] Allowed bytes in get_prep_value for a Geometry 2012-09-23 22:49:22 +02:00
Claude Paroz 43c7f8c3a3 [py3] Fixed unicode string in geoapp test 2012-09-23 22:11:46 +02:00
Claude Paroz 874908e3bb [py3] Updated PostGIS adapter 2012-09-23 20:32:52 +02:00
Claude Paroz 799786a7b6 [py3] Fixed outdated map() call in GIS sql compiler 2012-09-23 20:32:52 +02:00
Aymeric Augustin 98b6ce60f4 Made a version condition less confusing.
Fixed #18762 (again).
2012-09-23 20:18:29 +02:00
Claude Paroz 5330cd50cd [py3] Fixed GEOS/GDAL tests 2012-09-23 19:59:27 +02:00
Claude Paroz 8cdc84726e [py3] Added buffer/memoryview compatibility
Even if buffer and memoryview are not strictly identical, it should
be safe to consider them equivalent for GIS support.
Thanks Aymeric Augustin for the review.
2012-09-23 19:55:53 +02:00
Aymeric Augustin 3174b5f2f5 Fixed #18982 - Caught TypeError in DateField.clean
Thanks gwahl at fusionbox com.
2012-09-23 13:27:01 +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
Claude Paroz 8599f64e54 Fixed #18861 -- Triggered message validation with locmem email backend
Thanks Bruno Renié for the report and the initial patch.
2012-09-22 15:17:13 +02:00
Brian Galey 0ab8c58ca8 Fixed #18968 -- Only use separate GML regex for SpatiaLite < 3.0 2012-09-22 15:10:42 +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
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
Claude Paroz 59afc18f37 Made geo3d tests independent from each other 2012-09-22 11:39:53 +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
Claude Paroz 486e67598f Fixed #10853 -- Skipped some sessions tests with dummy cache backend 2012-09-21 13:17:25 +02: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 26ff2be787 Imported getLogger directly from logging module
This was a remainder of some 2.4 compatibility code.
2012-09-20 21:03:24 +02: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 7e32dab3a6 Fixed #17687 -- Made LayerMapping router-aware
Thanks nosamanuel@gmail.com for the report and the initial patch.
2012-09-20 10:12:47 +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
Dave Hall 44767f2caf Use unicode.translate to speed up js escaping. 2012-09-18 21:15:15 +02:00
Jeremy Dunck 40e62a5ccd Fixed #18980 -- Fixed assertContains regression when passed an object 2012-09-18 21:05:41 +02:00
Florian Apolloner 319e135519 Fixed #18800 -- Support numbers bigger than max float in `numberformat`.
Thanks to jbvsmo for the patch and Brad Pitcher for the tests.
2012-09-18 19:43:50 +02:00
Florian Apolloner 11cdfb35a4 Merge pull request #375 from collinanderson/patch-8
versionadded for next/previous_year generic-date-based views doc
2012-09-18 10:32:22 -07:00
Collin Anderson b771bcc7b4 document changes for YearArchiveView. 2012-09-18 11:06:10 -04:00
Preston Holmes 70248cce0a Fixed #18971 -- added root level CONTRIBUTING doc 2012-09-17 22:09:07 -07: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
Florian Apolloner 06f79354d0 Added tests for d21f3d9b17. 2012-09-17 21:56:19 +02:00
Florian Apolloner d21f3d9b17 Only update `last_login` instead of the whole user object in `update_last_login`. 2012-09-17 19:52:22 +02:00
Russell Keith-Magee 6494bf91f2 Improved validation of swappable model settings. 2012-09-17 21:38:44 +08: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 5a04cde342 Removed some unused imports. 2012-09-17 07:15:14 +08:00