Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
Commits on Jun 07, 2012
@apollo13 apollo13 Don't escape object ids when passing to the contenttypes.shortcut view.
This commit also changes the string pk to string_pk instead of id, to test
if the admin uses .pk throughout the codebase.
@dhepper dhepper Fixed #18433 -- Fixed "View on Site" link in inline admin for models …
…with custom PK
Commits on Jun 08, 2012
@aaugustin aaugustin Fixed #18125 -- Explained caveat with filters
Thanks ebrelsford AT and oinopion.
@aaugustin aaugustin Merge pull request #127 from dhepper/master
Fixed #18433 -- Fixed "View on Site" link in inline admin for models with custom PK

Thanks dhepper for the patch and apollo13 for the review.
@aaugustin aaugustin Merge pull request #123 from apollo13/ticket18381
Fixed #18381 -- Stopped escaping object ids

when passing them to the contenttypes.shortcut view.

Thanks apollo13 for the patch and dhepper for the review.
@aaugustin aaugustin Proof-read the new contributing guide.
Many thanks to Daniele Procida.
@aaugustin aaugustin Explained an alternative way to fetch a branch.
This avoids adding each contributor as a remote.

Thanks Fruneau for the report.
@aaugustin aaugustin Clarified the purpose of the pull requsets docs
One is for the community, the other for the core team.

Thanks Reinout van Rees for the report.
@audreyr audreyr Revised the text in the 'Using a form in a view' section. 3c05b50
@audreyr audreyr Revised the text in the 'Processing the data from a form' section. 7ab6e32
@aaugustin aaugustin Fixed an error in a git command. 7ae6651
@akaariai akaariai Added myself to committers 18aed86
@adrianholovaty adrianholovaty Fixed #18440 -- Pointed out that ReportLab is not thread safe. Thanks…
@akaariai akaariai Used git log instead of git show for last commit's timestamp
The reason for this was that git show included the whole changeset in
the output, but only the UTC timestamp was needed. By using git log
it is possible to get just the timestamp. The whole changeset can be
large, and can cause unicode encoding errors.
@charettes charettes Fixed #18399 – Added a way to get ContentTypes for proxy models
Added kwargs for_concrete_model and for_concrete_models to ContentType
methods get_for_model() and get_for_models(). By setting the flag to
False, it is possible to get the contenttype for proxy models.
@akaariai akaariai Cleaned whitespace errors introduced in previous commit a035d9d
@akaariai akaariai Fixed #16418 -- Made generic views work with ModelForms
Generic views assumed any object's _meta will be model Options. This
is not true for ModelForms for example. Took isinstance(obj, Model)
in use instead.
Commits on Jun 09, 2012
@claudep claudep Fixed #17760 -- Implemented callable database features as cached prop…

This does remove the requirement to call features.confirm() method
before checking the properties.
Thanks cdestiger and Ramiro Morales for their work on the patch.
@claudep claudep Reverted 905e33f, now that DatabaseFeatures does not need confirm
Connection.features does not need to be confirmed any more, after
commit aa42357, rendering obsolete the workaround when using
TEST_MIRROR (Refs #16885, #17760).
@claudep claudep Removed test of connection features before setting up databases ef906b1
@claudep claudep Fixed #17159 -- Validated returned number of next|previous_page_number
Thanks mehta.apurva at for the report and the initial patch
and neaf for the complete patch.
@claudep claudep Fixed pagination example wrt new next_page_number behavior 514e827
@claudep claudep Fixed #18157 -- Documented that setting PASSWORD_HASHERS can speed up…
… tests
@claudep claudep Added note about including fixtures hashing algorithm
Refs #18157.
Commits on Jun 10, 2012
@spookylukey Corrected way to get URL of object in admin history template e9497a3
@claudep claudep Fixed #18457 -- Fixed encoding error in yaml deserializer
Thanks jpaugh64 for the report.
Commits on Jun 11, 2012
@jezdez jezdez Fixed #18451 -- Vastly improved class based view documentation.
Many thanks to Daniel Greenfeld, James Aylett, Marc Tamlyn, Simon Williams, Danilo Bargen and Luke Plant for their work on this.
@claudep claudep Fixed #18463 -- Forced type() argument to be a byte string 3dd5d72
Commits on Jun 12, 2012
@claudep claudep Cleaned up locale-related encoding issues 35f9c2c
@claudep claudep Added missing encoding prefix in localflavor test a7ef802
Commits on Jun 13, 2012
@claudep claudep Fixed #18461 -- Ensured that last_executed_query returns Unicode
Thanks Anssi Kääriäinen for the review.
@akaariai akaariai Fixed connection.queries encoding handling on Oracle
In addition, removed a possibly problematic .filter() call from
backends.test_query_encoding test. It is possible the .filter could
cause collation problems on MySQL, and as it wasn't absolutely needed
for the test it seemed better to get rid of the call.

Refs #18461.
@claudep claudep Removed escaping test of query content
As the content of last_executed_query() is not under Django's control
for most backends, it is useless to test too specific aspects of it.
Commits on Jun 14, 2012
@claudep claudep Fixed #12140 -- Fixed http.urlencode result for empty lists
Thanks aneil for the report and the initial patch.
@claudep claudep Fixed #17754 -- Refactored gis.measure
This refactoring does allow much easier MeasureBase subclassing.
Many thanks to Ricardo di Virgilio for the initial patch.
@claudep claudep Discovered some geodjango tests with standard mechanism
No need to special case tests discovery for regular first-level
gis tests.
@claudep claudep Executed SpatialRefSysTest only with spatial backend 023b704
@spookylukey Reverted part of 169b1a4 which was mistakenly applied to a non-iterat…
…or class.

Doing next(IfParser()) works for Python 2.7, because it calls, but in Python 3 will call IfParser.__next__() which does
not work since it is not an iterator and does not have that method.
@spookylukey method renamed to avoid confusion with iterator proto…
Commits on Jun 15, 2012
@claudep claudep Favored text (StringIO) over binary content for deserialization
This is also more Python 3 compatible, as the json module in
Python 3 is expecting text. Thanks Vinay Sajip for noticing it.
Commits on Jun 16, 2012
@jphalip jphalip Skip GeometryFieldTest if there's no spacial database. 1794e36
@jphalip jphalip Fixed #18477 -- Fixed colspan value when a TabularInline form contain…
…s validation errors. Thanks to yedpodtrzitko for the report and patch.
@jphalip jphalip Fixed the path to the admin's script in the doc. 79ef390
@jphalip jphalip Updated the admin's minified JS files. fadcc6d
Commits on Jun 17, 2012
@jphalip jphalip Fixed #18420 -- Prevented the admin JS from crashing when the main fo…
…rm contains no field. Thanks to maciej.maciaszek for the report and patch.
@apollo13 apollo13 Fixed GIS testsuite.
Moved HAS_SPATIALREFSYS back into the tests namespace since it only operates
on the default database and isn't a global flag like HAS_GDAL.
Commits on Jun 18, 2012
@dhepper dhepper Fixed #18450 -- Removed default values for i18n JavaScript URLs in Ad…
…min templates
@dhepper dhepper Fixed #18444 -- Replace hard coded "View on Site" URLs aee9eec
@gabejackson gabejackson Fixed #18154 -- Documentation on closing File objects and best practices ffa6d95
@SmileyChris SmileyChris Fixed #14502 again -- saner verbatim closing token
Previously, the closing token for the verbatim tag was specified as the
first argument of the opening token. As pointed out by Jannis, this is
a rather major departure from the core tag standard.

The new method reflects how you can give a specific closing name to
{% block %} tags.
Commits on Jun 19, 2012
@tsaylor tsaylor Fixed a documentation typo on the widget page. f8ef93a
@dgerzo dgerzo Added support for gdal 1.9. 45a1a54
@claudep claudep Fixed #15271 -- Defined a to_python method for GeometryField
Thanks volrath and copelco for their work on the patch.
@claudep claudep Removed unneeded u prefixes f08fa5b
Commits on Jun 22, 2012
@spookylukey Fixed #17776 - DoesNotExist is not picklable
Thanks to ambv for the report