mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-21 06:40:45 +00:00
Code Issues 32 Releases Wiki Activity
15,903 Commits 29 Branches 438 Tags
Commit Graph

4 Commits

Author SHA1 Message Date
Tim Graham
22d3048676 [1.6.x] Added dates to release notes. 
Backport of 15cd71ed24945ff7be5716580603fd65c0d45ef7 from master
 2015-01-02 19:20:59 -05:00
Tim Graham
0114b9df13 [1.6.x] Updated six to 1.9.0. 
Backport of 52f0b2b62262743d5f935ddae29428e661b5d8ea from master
 2015-01-02 13:33:46 -05:00
Simon Charette
2fd16232b1 [1.6.x] Fixed #23754 -- Always allowed reference to the primary key in the admin 
This change allows dynamically created inlines "Add related" button to work
correcly as long as their associated foreign key is pointing to the primary
key of the related model.

Thanks to amorce for the report, Julien Phalip for the initial patch,
and Collin Anderson for the review.

Backport of f9c4e14aeca7df79991bca8ac2d743953cbd095c from master
 2014-11-25 13:48:50 -05:00
Tim Graham
61f20b42cd [1.6.x] Updated six to 1.8.0. 
Backport of 81477c91f6 from master
 2014-11-04 21:25:08 -05:00