innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
18,547 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

3436 Commits

Author SHA1 Message Date
Markus Holtermann b419bd3843 [1.7.x] Refs #24075 -- Silenced needless call_command output while running tests 
Thanks Tim Graham for the report

Backport of 51dc617b21 from master
 2015-01-15 21:13:27 +01:00
Markus Holtermann 478546fcef [1.7.x] Fixed #24075 -- Prevented running post_migrate signals when unapplying initial migrations of contenttypes and auth 
Thanks Florian Apolloner for the report and Claude Paroz and Tim Graham for the review and help on the patch.

Backport of 737d24923a from master.
 2015-01-14 20:37:56 +01:00
Claude Paroz 7e65876b7c [1.7.x] Fixed #24097 -- Prevented AttributeError in redirect_to_login 
Thanks Peter Schmidt for the report and the initial patch.
Thanks to Oktay Sancak for writing the original failing test and
Alvin Savoy for supporting contributing back to the community.
Backport of d7bc37d61 from master.
 2015-01-10 10:13:50 +01:00
Tim Graham 4aed731154 [1.7.x] Increased the default PBKDF2 iterations. 2015-01-03 13:36:13 -05:00
Tim Graham a79012f6d8 [1.7.x] Fixed #24000 -- Corrected contrib.sites default site creation in a multiple database setup. 
Backport of 89e2c60f43 from master
 2014-12-27 10:29:21 -05:00
wrwrwr 965a999ae5 [1.7.x] Fixed #23929 -- Added more tests for create_default_site. 
Backport of 1f98ec2e53 from master
 2014-12-27 10:26:43 -05:00
Tim Graham ac098867c0 [1.7.x] Fixed #23525 -- Fixed admindocs crash on apps installed as eggs. 
Thanks welbornprod for report and initial patch.

Backport of 01ab84c613 from master
 2014-12-22 15:19:48 -05:00
Mosson, Andrew 6d8c14621e [1.7x.] Fixed #23497 -- Made admin system checks run for custom AdminSites. 
Backport of b7219c7ba5 from master
 2014-12-17 09:16:05 -05:00
Tim Graham c64286c62b [1.7.x] Fixed #23857 -- Fixed admin crash with "save as new" and deleting inline. 
Thanks amarandon for the report.

Backport of c7a19f4203 from master
 2014-12-12 11:49:44 -05:00
Markus Amalthea Magnuson 63d8f84e5d [1.7.x] Fixed typo in admin deprecation message. 
Backport of d4e449d730 from master
 2014-12-11 13:40:05 -05:00
Tim Graham 38960a5dd8 [1.7.x] Fixed assertion from refs #23939 test. 
The assertion is different on master due to
393c0e2422.
 2014-12-03 14:09:23 -05:00
Tim Graham 99c0cc5300 [1.7.x] Fixed #23939 -- Moved session verification out of SessionAuthenticationMiddleware. 
Thanks andrewbadr for the report and Carl Meyer for the review.

Backport of b06dfad88f from master
 2014-12-03 13:42:02 -05:00
Kamil Braun ccc30ffe57 [1.7.x] Fixed #23934 -- Fixed regression in admin views obj parameter. 
Backport of 0623f4dea4 from master
 2014-12-02 08:43:59 -05:00
Simon Charette 2a20bccda9 [1.7.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 f9c4e14aec from master
 2014-11-25 13:32:24 -05:00
Redouane Zait f671905fdb [1.7.x] Fixed #23898 -- Added missing context to admin's deleted_selected view. 
Backport of 8e7b384d89 from master
 2014-11-25 11:27:30 -05:00
Veres Lajos 6b32adda59 [1.7.x] Fixed typos using https://github.com/vlajos/misspell_fixer 
Backport of a71a2ea756 from master
 2014-11-03 21:07:05 -05:00
Claude Paroz 378f94e39e [1.7.x] Confirmed Spatialite 4 support 
Backport of e62dea9ad5 from master
 2014-11-03 10:51:23 -05:00
Tim Graham 17205a98ed [1.7.x] Fixed #23731 -- Fixed migrations crash when adding blank GeometryFields on PostGIS. 
Thanks raratiru for the report and Claude Paroz for review.

Backport of d6d55368d4 from master
 2014-10-31 18:38:46 -04:00
Aymeric Augustin 12bace46c1 [1.7.x] Avoided using private API get_template_from_string. 
Conflicts:
	django/contrib/webdesign/tests.py

Backport of c0c1bb9e from master.
 2014-10-31 11:43:54 +01:00
Tim Graham 9c9f35ed27 [1.7.x] Fixed #23152 -- Added support for transactional Spatialite metadata initialization. 
Thanks Doug Goldstein for the initial patch.

Backport of 57e40551e4 from master
 2014-10-30 13:58:02 -04:00
Tim Graham bb42bab6d3 [1.7.x] Fixed #23719 -- Fixed MySQL 5.6 crash with GeometryFields in migrations. 
Backport of 03bd79ed2 from master
 2014-10-29 08:25:59 -04:00
Claude Paroz a0cfd77971 [1.7.x] Added GeoDjango compatibility with mysqlclient driver 
Thanks Tim Graham for helping on that issue.
 2014-10-27 16:10:35 +01:00
Konrad Świat fd3dccb8dd [1.7.x] Fixed #23616 - Fixed generic relations in ModelAdmin.list_filter. 
Thanks ranjur for reporting bug, timgraham for review,
and collinanderson for contributing tips.

Backport of 06b11b617e from master
 2014-10-10 13:12:26 -04:00
André Ericson fa4b6482df [1.7.x] Fixed #23611 -- update_or_create failing from a related manager 
Added update_or_create to RelatedManager, ManyRelatedManager and
GenericRelatedObjectManager.
Added missing get_or_create to GenericRelatedObjectManager.

Conflicts:
	tests/generic_relations/tests.py
	tests/get_or_create/tests.py

Backport of ed37f7e979 from master
 2014-10-08 04:55:47 +07:00
Markus Holtermann c2508990cb [1.7.x] Fixed #23601 -- Ensured view exists in URLconf before importing it in admindocs. 
Backport of 2f16ff5a6c from master
 2014-10-06 13:44:01 -04:00
Emmanuelle Delescolle f8d845910b [1.7.x] Fixed #23604 -- Allowed related m2m fields to be references in the admin. 
Thanks Simon Charette for review.

Backport of a24cf21722 from master
 2014-10-06 08:43:05 -04:00
Claude Paroz e9c8aefbce [1.7.x] Updated translations from Transifex 2014-09-30 20:51:54 +02:00
Tim Graham 9d7a4ea205 [1.7.x] Fixed #23537 -- Added Oracle GIS SchemaEditor. 
Thanks Shai Berger for review.

Backport of a8f07530a7 from master
 2014-09-25 21:25:46 -04:00
Tim Graham 692df41419 [1.7.x] Added missing import removed in bad merge. 2014-09-25 18:02:40 -04:00
Tim Graham 1dec42822c [1.7.x] Fixed #23538 -- Added SchemaEditor for MySQL GIS. 
Thanks Claude Paroz for suggestions and review.

Backport of 74e7f91e6d from master
 2014-09-25 14:36:31 -04:00
Justin Caratzas cc74d8e02e [1.7.x] Fixed #23539 -- Added get_extra(), get_max_num(), and get_min_num() hooks to GenericInlineModelAdmin. 
Backport of cf43a1ee90 from master
 2014-09-24 06:33:07 -04:00
Tim Graham b4c9920352 [1.7.x] Skipped a broken geoapp test on Oracle; refs #23504. 
Backport of 729cd6a11a from master
 2014-09-23 20:01:59 -04:00
Tim Graham 17a4038cf3 [1.7.x] Skipped a broken GIS test on Oracle; refs #23504. 
Backport of 828edc5ba9 from master
 2014-09-19 15:06:11 -04:00
Tim Graham b287676739 [1.7.x] Made a GIS test work on Oracle. 
Thanks Josh Smeaton and Claude Paroz for advice.

Backport of 7add30df01 from master
 2014-09-19 15:05:56 -04:00
Tim Graham 988c7425ff [1.7.x] Skipped an unsupported test on Oracle GIS. 
This is fixed more elegantly on master with a feature flag in 6c1a0581ab.
 2014-09-19 12:26:36 -04:00
Tim Graham aa9c69a726 [1.7.x] Fixed an inspectapp test on Oracle GIS. 
This is fixed more elegantly with a feature flag on master in 33e817a6d8.
 2014-09-19 12:21:43 -04:00
Tim Graham e295b0f875 [1.7.x] Removed unnecessary order_by() from a GIS test that crashed Oracle. 
Oracle cannot order_by() a TextField; refs #23504.

Backport of 7fc13178d6 from master
 2014-09-19 12:16:23 -04:00
Tim Graham a0a65b2fd2 [1.7.x] Skipped some broken tests on Oracle GIS; refs #23504. 
Backport of 7fce7f51ef from master
 2014-09-19 12:12:48 -04:00
Tim Graham c61d2c0387 [1.7.x] Improved GIS migration test cleanup; refs #23504. 
Backport of 8facb02faf from master
 2014-09-19 12:10:37 -04:00
Tim Graham 7de55fa68e [1.7.x] Fixed #23403 -- Fixed crash in contrib.sitemaps if lastmod returned a date rather than datetime. 
Thanks igorcc for the report and Preston Timmons for review.

Backport of 66580fe97c from master
 2014-09-11 16:15:03 -04:00
Tim Graham ac54e6af95 [1.7.x] Corrected indentation in a contrib.humanize test; refs #23340. 
Thanks Zach Borboa for the report.

Backport of 96010ae15b from master
 2014-09-10 12:27:11 -04:00
Simon Charette 9c4fb019cb [1.7.x] Fixed #23431 -- Allowed inline and hidden references to admin fields. 
This fixes a regression introduced by the 53ff096982 security fix.

Thanks to @a1tus for the report and Tim for the review.

refs #23329.

Backport of 342ccbddc1 from master
 2014-09-08 13:54:21 -04:00
Collin Anderson d19291e9ad [1.7.x] Fixed #23340 -- Corrected naturaltime docs to match behavior. 
Thanks zachborboa for the report and blackguest for the patch.

Backport of 7353e26d5d and 0a2bc6e6bd from master
 2014-09-06 08:00:29 -04:00
Andrew Godwin c5578ba9fa [1.7.x] Fixed #22411: Throw a more helpful error if contenttypes doesn't exist. 
Conflicts:
	django/contrib/contenttypes/models.py
 2014-09-05 12:05:25 -07:00
Claude Paroz 9ac713645b [1.7.x] Fixed #23374 -- Renamed StaticLiveServerCase to StaticLiveServerTestCase 
Refs #20739. Thanks Raphaël Hertzog for the report and the initial
patch.
Backport of 3a44e2000 from master.
 2014-08-28 08:46:54 +02:00
Simon Charette 4883516bea [1.7.x] Fixed #23329 -- Allowed inherited and m2m fields to be referenced in the admin. 
Thanks to Trac alias Markush2010 and ross for the detailed reports.

Backport of 3cbb7590cb from master
 2014-08-27 21:27:48 -04:00
Erik Romijn 307eef20e3 [1.7.x] Fixed #23075 -- Added documentation on novalidate attribute and made it default for admin 
Backport of cbdda28208 from master.
 2014-08-27 09:16:51 +02:00
Simon Charette 2b31342cdf [1.7.x] Prevented data leakage in contrib.admin via query string manipulation. 
This is a security fix. Disclosure following shortly.
 2014-08-20 14:42:48 -04:00
Preston Holmes 1a45d059c7 [1.7.x] Fixed #23066 -- Modified RemoteUserMiddleware to logout on REMOTE_USER change. 
This is a security fix. Disclosure following shortly.
 2014-08-20 14:42:48 -04:00
Claude Paroz 49280a73ea [1.7.x] Fetched translations from Transifex 2014-08-20 10:05:47 +02:00