p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,869 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

12869 Commits

Author SHA1 Message Date
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
Russell Keith-Magee 5d7bb22e8d Ensure swapped models can't be queried. 2012-09-15 19:59:49 +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
Russell Keith-Magee 57ac6e3d32 Merge remote-tracking branch 'django/master' into t3011 2012-09-15 14:31:54 +08:00
Bryan Veloso abfba3bb65 Correcting my English. 2012-09-14 19:26:11 -07:00
Bryan Veloso a01bce1e26 Adding myself to the committers list. 2012-09-14 19:24:39 -07:00
Tim Graham 87c06fa4f4 Merge pull request #364 from martey/ticket_18933 
Fixed #18933 - Fixes code example for cycle in docstring.
 2012-09-13 12:23:28 -07:00
Claude Paroz 690170a8b9 Removed unused quoting/encoding in gis db backend 2012-09-13 20:17:52 +02:00
Claude Paroz 7e5ebcce53 Fixed #18795 -- Fixed failing GeoDjango tests 
Proj.4 and SRS strings may slightly vary depending on the installed
libraries. Made some tests pass again with recent Proj.4/GDAL lib
versions.
 2012-09-13 16:20:11 +02:00
Jeremy Dunck 9db7652eef Fixed my terribly outdated profile in committers.txt in celebration of my commit bit. 2012-09-12 14:37:44 -07:00
Claude Paroz fbd4b3a518 [py3] Fixed GeoDjango mutable list tests 2012-09-12 16:13:58 +02:00
Claude Paroz c2c8d4044e Made minimal changes to make gis test suite start with Python 3 2012-09-12 15:03:46 +02:00
Claude Paroz 1aa218b857 Fixed test output check when password is blank 2012-09-12 11:58:02 +02:00
Claude Paroz 703c266682 Fixed #18182 -- Made is_usable_password check if hashing algorithm is correct 
The display of the ReadOnlyPasswordHashWidget has also been improved to
distinguish empty/unusable password from erroneous password.
Fixed #18453 also.
Thanks danielr and Leo for the reports and Moritz Sichert for the
initial patch.
 2012-09-12 11:32:50 +02:00
Claude Paroz 859aa2a6c4 Fixed #18790 -- Encoded database password on Python 2 
Thanks thcourbon@gmail.com for the report.
 2012-09-12 10:16:49 +02:00
Julien Phalip 0133d66734 Removed a colloquialism ("and then some") from the documentation index page that would be confusing to non-native English speakers. 2012-09-10 17:27:50 -07:00
Julien Phalip 6eb4f25692 Removed an obsolete documentation page about admin style customization. 2012-09-10 17:19:35 -07:00
Claude Paroz f1bdfbd24b Document and test 'type' usage in Widget attrs 
Refs #16630.
 2012-09-10 19:31:11 +02:00
Alex Gaynor 611a2b266b Merge pull request #366 from collinanderson/patch-6 
fixed rfc comment typo in middleware/csrf.py
 2012-09-10 08:20:00 -07:00
Collin Anderson f416ea9c8d fixed rfc comment typo in middleware/csrf.py 2012-09-10 12:11:24 -03:00
Mike Grouchy cb1614f7b3 Fixed #18611 -- Display current date/time when running runserver 2012-09-10 13:35:21 +02:00
Karen Tracey 2e92858386 Fixed a couple of test failures on Windows. 2012-09-09 15:07:04 -04:00
Carl Meyer fcec904e4f Fix an HTML-parser test that's failed in Python 2.6.8 since 5c79dd58. 
The problem description in #18239 asserted that
http://bugs.python.org/issue670664 was fixed in Python 2.6.8, but based on
http://bugs.python.org/issue670664#msg146770 it appears that's not correct; the
fix was only applied in 2.7, 3.2, and Python trunk. Therefore we must use our
patched HTMLParser subclass in all Python 2.6 versions.
 2012-09-09 12:13:42 -06:00
Carl Meyer 75ef980e20 Fix Python 3 test failure introduced in a78dd109. 2012-09-09 11:37:21 -06:00
Karen Tracey ffe8bc00bf Replaced backwards-incompatible changes reference 
The previously-referenced wiki page documents backwards-incompatible
changes from .96 to 1.0. Changed that referece to point to current
in-development release notes, which is where such changes are now
documented.
 2012-09-09 12:53:32 -04:00
Florian Apolloner 9ca17f883d Replace nested try/finally try/except with try/except/finally. 2012-09-09 13:00:10 +02:00
Martey Dodoo 3fb2662edc Fixes #18933. Fixes code example in docstring. 
Makes code example of silent keyword docstring in cycle templatetag
method the same as in the documentation.
 2012-09-09 00:35:40 -04:00
Russell Keith-Magee f2ec915b20 Merge remote-tracking branch 'django/master' into t3011 2012-09-09 08:29:51 +08:00
Malcolm Tredinnick 5e99a3d41b Adjust d7853c5 to not show ignorable warnings when running tests. 2012-09-08 20:28:31 -04:00
Russell Keith-Magee 19526563b5 Merge recent changes from master. 2012-09-09 08:22:26 +08:00
Carl Meyer a3b2136b28 Remove an outdated import inadvertently introduced in tests. 2012-09-08 18:22:03 -06:00
Russell Keith-Magee 2c5e833a30 Corrected admin_views tests following removal of the email fallback on admin logins. 2012-09-09 07:53:46 +08:00
Malcolm Tredinnick c4aa26a983 Internal refactoring; moving LOOKUP_SEP up one level. 
In an ideal world, nothing except django.db.models.query should have to
import stuff from django.models.sql.*. A few things were needing to get
hold of sql.constants.LOOKUP_SEP, so this commit moves it up to
django.db.models.constants.LOOKUP_SEP.

There are still a couple of places (admin) poking into sql.* to get
QUERY_TERMS, which is unfortunate, but a slightly different issue and
harder to adjust.
 2012-09-08 19:51:36 -04:00
Carl Meyer a78dd109e6 Fixed #15552 -- LOGIN_URL and LOGIN_REDIRECT_URL can take URLpattern names. 
Thanks UloPe and Eric Florenzano for the patch, and Malcolm Tredinnick for
review.
 2012-09-08 16:58:35 -06:00
Tim Graham 518c582966 Fixed #15906 - Documented HEAD method in CBVs; thanks zsiciarz for the patch. 2012-09-08 18:45:02 -04:00
Tim Graham 72ca530af5 Fixed typo in commit for #15730; thanks Bruno Renié for the catch. 2012-09-08 17:34:22 -04:00
Carl Meyer 67dceeef44 Remove a couple unused imports. 2012-09-08 14:30:11 -06:00
Carl Meyer 307706d082 Fixed #18545 -- Make the 'no DJANGO_SETTINGS_MODULE' error message more useful.Thanks Nick Coghlan for the report, and Malcolm Tredinnick for review. 2012-09-08 14:26:33 -06:00
James Bennett c26dd4f154 Merge pull request #363 from ubernostrum/multidb-examples-18657 
Ticket 18657: Fix inconsistent DB names in router example.
 2012-09-08 13:16:16 -07:00
James Bennett 5c5226a520 Fix typo: Non -> None 2012-09-08 16:14:13 -04:00
James Bennett 408c10e541 Untabify multi-db docs. 2012-09-08 16:08:01 -04:00
James Bennett 5d1f09f450 Ticket 18657: Fix inconsistent DB names in router example. 
This rewrites the entire example to use the same DB names throughout,
and also is hopefully a bit more sensibly described. Additionally, the
missing import of the random module for choosing a read slave is
included in the example now.
 2012-09-08 16:02:00 -04:00
Claude Paroz d7853c55ed Removed warning check in test_load_overlong_key 
Some backends issue a warning here, others not. This is not the primary
goal of the test, so the assertion about the warning has been removed.
Thanks Carl Meyer for noticing the issue and suggesting the fix.
 2012-09-08 21:31:46 +02:00