Commit Graph

9073 Commits

Author SHA1 Message Date
Gabriel Hurley 56b9e0c45f [1.2.X] Fixed #14736 -- corrected an ungrammatical sentence in the template tags docs. Thanks to DD for the report and adamv for the draft patch.
Backport of [14677] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 06:44:59 +00:00
Honza Král 2aa47f2b32 [1.2.X] Preventing problems possibly introduced by r14662
acquire a lock before entering a try block that ends with the lock's
release. Thanks for the catch Alex.

Backport of r14668 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 17:35:48 +00:00
Ramiro Morales 4e3c8c6aff [1.2.X] Fixed #14453 -- Changed handling of microseconds part in typecast_timestamp() DB backend helper function to be more correct. Thanks philipn for the report and fix.
Backport of [14664] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 15:19:46 +00:00
Honza Král 99bad1b055 [1.2.X] Make django signals more thread-safe. Thanks milosu for the patch!
Backport of r14662 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 14:58:18 +00:00
Honza Král 4d7525c5b1 [1.2.X] CZ Localflavor clean() incorrectly called super.__init__. Thanks for the report and patch idangazit!
Backport of r14660 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 14:08:13 +00:00
Chris Beaven d04ffd7247 Fixes #13804 -- URLField validation failure for a url containing '://' on the path and no scheme. Backport of r14657
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 10:16:02 +00:00
Justin Bronn 4a8519334d [1.2.X] Now possible to run the GeoDjango test suite with a minimal settings file. Refs #10420, #14439.
Backport of r14653 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 23:57:01 +00:00
Gabriel Hurley 76a51a3f04 [1.2.X] Replaced an unnecessary UTF8 character in the admindocs docs. Thanks to Luke Plant for the report.
Backport of [14646] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 11:11:39 +00:00
Gabriel Hurley 762aaf45b7 [1.2.X] Fixed #14727 -- Corrected three minor issues in the docs. Thanks to OldTroll for the report and the patch.
Backport of [14644] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 10:51:04 +00:00
Luke Plant 077d04b7fe [1.2.X] Fixed a garbage character that was somehow introduced into some backported docs.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 01:56:34 +00:00
Luke Plant 8a0de6985c [1.2.X] Fixed hyperlinking of template tags for Sphinx >= 1.0
Follow on from incomplete fix in [14477], and [14631] which removed
compatibility for Sphinx < 1.0

Backport of [14639] from trunk, and [14477] which was never applied to 1.2.X
branch but should have been.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 01:56:20 +00:00
Ian Kelly 84d809d822 [1.2.X] Updated an old workaround described in the Oracle backend notes with more modern advice.
Backport of r14637 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 01:15:14 +00:00
Carl Meyer b199cb36f3 [1.2.X] Fixed poorly-constructed test from r14612. Thanks to Alex Gaynor for the eagle eyes.
Backport of r14635 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 00:06:19 +00:00
Alex Gaynor 7236b76e25 Corrected some issues with the backport from [14627].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:56:38 +00:00
Ramiro Morales 8d3e66fad6 [1.2.X] Removed compatibility with Sphinx < 1.0 workarounds in our extension code. Also, started to use the 'needs_sphinx' Sphinx config var.
Follow up on r14624.

Backport of [14631] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:23:17 +00:00
Ian Kelly 04fec1be96 [1.2.X] Fixed #13351: Added documentation about the cx_Oracle 'threaded' option to the oracle backend notes.
Backport of r14630 from trunk.

Thanks to Skaffen for the suggestion.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:23:03 +00:00
Ramiro Morales 237e9557d7 [1.2.X] Corrected change in behavior regarding the page shown after the 'Save' button is pressed when adding a user through the admin.
It had been introduced in trunk (r13503) and between 1.2.1 and 1.2.2 (r13504). The original fix intended to correct a similar problem introduced between 1.1 and 1.2 (r12218) this time in the 'Save and add another' button.
We have now tests for the three buttons present in the Add User admin form to avoid future regressions.
Thanks to Juan Pedro Fisanotti and Cesar H. Roldan for their work.

Backport of [14628] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:04:48 +00:00
Alex Gaynor da163cc957 [1.2.X] Began converting localflavor doctests into unittests, starting with the German ones. Also introduced a new base class to facilitate ease of testing form fields. We have always been at war with doctests. Thanks to Idan Gazit for the patch. Backport of [14626].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 19:34:17 +00:00
Carl Meyer 426a28f967 [1.2.X] Bumped documentation-building requirements to Sphinx 1.0.2 and Pygments 1.1. The use of 'console' highlight in staticfiles docs requires Pygments 1.1.
Backport of r14624 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 17:30:56 +00:00
Carl Meyer 5ef3269b78 [1.2.X] Fixed #14728 -- Broadened warning about django-admin.py missing .py suffix to include more than just Ubuntu, since at least Fedora also does this. Thanks to giallu for the report.
Backport of r14621 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 14:57:50 +00:00
Alex Gaynor 4f2e9aed33 [1.2.X] Corrected the way databases were compared. This allows running the test suite with two in memory SQLite databases. Backport of [14619].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 08:15:40 +00:00
Alex Gaynor 9edd6953cc [1.2.X] Converted the model_regress doctests into unittests. We have always been at war with doctests. Backport of [14614].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 23:51:20 +00:00
Carl Meyer 87fe4be9c5 [1.2.X] Fixed pk uniqueness validation for new objects created outside of a ModelForm. Also removed need for ModelForm to poke at Model._state.adding, keeping it an internal ORM concern.
Backport of r14613.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 23:46:26 +00:00
Carl Meyer d88cabd3da [1.2.X] Fixed #14234 -- Re-validating a model instance added via ModelForm no longer throws spurious PK uniqueness errors. Thanks to David Reynolds and Jeremy Dunck.
Also moved Model._adding to Model._state.adding to reduce instance namespace footprint.

Backport of r14612.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 23:46:09 +00:00
Jannis Leidel 395af9d5cf [1.2.X] Fixed #7077 and #7431 -- Use getpass.getuser instead of pwd.getpwuid to determine the current system user's username in the createsuperuser management command to enable the feature on Windows. getpass.getuser automatically falls back to the previous method.
Backport from trunk (r14607).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 20:30:44 +00:00
Alex Gaynor 9057450af0 [1.2.X] Added a hidden toctree pointing at the index file in the docs to silence a sphinx warning. Backport of [14605].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 20:26:58 +00:00
Alex Gaynor 030fdcc7c8 [1.2.X] Fixed #14713 -- documented that resolve can raise Http404. Thanks to Adam for the patch. Backport of [14603].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 20:04:49 +00:00
Alex Gaynor 1aaf270d73 [1.2.X] Fixed #14423 -- corrected incorrect SQL being generated when a nullable, inherited field was used in an exclude. Thanks to PhiR_42 for the patch. Backport of [14600].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 16:47:46 +00:00
Alex Gaynor 6469eec71d [1.2.X] Corrected some syntax issues in the docs. Backport of [14598].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 16:11:17 +00:00
Jannis Leidel f58d17db74 [1.2.X] Fixed a bunch of code examples in the form media documentation.
Backport from trunk (r14594).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:45:15 +00:00
Russell Keith-Magee 17d0c7ad4c [1.2.X] Migrated model_formsets doctests. Thanks to Gregor Müllegger for the patch.
Backport of r14590 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 13:38:53 +00:00
Ramiro Morales 8acad926df [1.2.X] Fixed #11369 -- Corrected verbose_name_plural model Meta option to be consistent with verbose_name when using abstract model inheritance. Thanks Beetle_B for the report.
Backport of [14588] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 12:24:47 +00:00
Alex Gaynor 03b111c6cc [1.2.X] Fixed #12687 -- fixed an issue with aggregates and counts in conjunction with annotations where the QuerySet was provably empty. Backport of [14586].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 02:58:59 +00:00
Chris Beaven 929b8ff3da [1.2.X] Remove an obsolete admonition in tutorial one (referencing 0.96 functionality)
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 02:24:58 +00:00
Ramiro Morales 746ce7d967 [1.2.X] Fixed #14691 -- Made ForeignKey.validate() use the right database. Thanks Marco Paolini for the report.
Backport of [14580] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 22:17:51 +00:00
Chris Beaven 6ff1f38646 [1.2.X] Better cross-referencing of the USE_THOUSAND_SEPARATOR setting in documentation. Thanks to Klaas van Schelven for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 21:34:53 +00:00
Russell Keith-Magee 10fafed666 [1.2.X] Migrated model_inheritance_regress doctests. Thanks to Gregor Müllegger for the patch.
Backport of r14576 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 15:15:47 +00:00
Russell Keith-Magee 587c66f7a0 [1.2.X] Migrated forms (minus localflavor) doctests. A huge thanks to Daniel Lindsley for the patch.
Backport of r14570 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 14:48:52 +00:00
Luke Plant 3cbcce429c [1.2.X] Corrected 'email' to 'e-mail' in error reporting docs.
Backport of [14571] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 13:32:07 +00:00
Alex Gaynor 478a4e22ad [1.2.X] Added a test for using an `__in` lookup with a ValueListQueryset from a none() call. Refs #14622. Backport of [14568].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 02:36:00 +00:00
Alex Gaynor bfab752286 [1.2.X] Fixed #14696, corrected some messed up syntax in the docs. Backport of [14566].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 02:21:38 +00:00
Ramiro Morales 2f91f76417 [1.2.X] Fixed #3055 -- Validate that models target of a GenericRelation have a GenericForeignKey field.
Thanks jason for diagnosing the problem and Marcos Moyano for the patch.

Backport of [14563] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 23:36:40 +00:00
Ramiro Morales dc3b524f6c [1.2.X] Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work.
Backport of [14560] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 15:50:01 +00:00
Ramiro Morales a052bcb011 Fixed #14536 -- Corrected DB connection OPTIONS examples in documentation. Thanks denilsonsa for reporting the error.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 14:09:52 +00:00
Ian Kelly 17bd39ae5a [1.2.X] Backport of r14547 from trunk.
Fixed a test case that was failing in Oracle due to conflation of null and empty strings.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 19:47:41 +00:00
Alex Gaynor 8c7df2198a [1.2.X]Converted m2m_signals from doctests to unittests. Thanks to Gregor Müllegger for the patch. We have always been at war with doctests. Backport of [14548].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 19:40:04 +00:00
Ian Kelly 80946dc0fa [1.2.X] Backport of r14545 from trunk.
Fixed a multiple_database test case that was failing in Oracle due to forced table name capitalization.  The test case now matches the style used by the raw_query tests.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 18:51:54 +00:00
Gabriel Hurley e074d2b9e9 [1.2.X] Fixed #14669 -- corrected an ungrammatical sentence in the internationalization docs. Thanks to steveire for the report.
Backport of [14539] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 02:49:21 +00:00
Ian Kelly 0046f37393 [1.2.X] Backport of r14537 from trunk.
Fixed #11101: Rewrote the sequence reset SQL for Oracle to prevent it from performing an implicit commit that caused all fixtures to be automatically committed, causing a large number of test failures.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 01:54:07 +00:00
Alex Gaynor 4e4418d34d [1.2.X] Removed the executable bit from a test file, it wasn't. Thanks to Florian for the report. Backport of [14530].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 17:53:59 +00:00