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

3376 Commits

Author SHA1 Message Date
Nick Sandford 9638daec5c [1.7.x] Fixed #23078 -- Regression in update_contenttypes() interactivity. 
Thanks raymond at adaptiv.nl for the report.

Backport of fa3cf006b2 from master
 2014-07-23 08:49:55 -04:00
Claude Paroz ddb5674945 [1.7.x] Fixed #23030 -- Properly handled geometry columns metadata during migrations 
Thanks kunitoki for the report and initial patches.
Backport of 8c30df15f1 from master.
 2014-07-23 12:16:11 +02:00
Claude Paroz 86655111c9 [1.7.x] Adapted SpatialiteGeometryColumns model to spatialite >= 4 
See also:
https://www.gaia-gis.it/fossil/libspatialite/wiki?name=switching-to-4.0
Backport of 19d8f2ebf4 from master.
 2014-07-23 12:15:44 +02:00
Iain Dawson 59fec1ca9b [1.7.x] Replaced instances of 'his/her' with 'their'. 
Backport of 8fbf13a6c8 from master
 2014-07-21 19:54:22 +00:00
Claude Paroz 6e41ae1a4e [1.7.x] Fixed #23064 -- Added lib detection support for GDAL 1.10/1.11 
Note that GDAL 1.11 is not yet officially supported, until someone
has tested it and can confirm it has no issues with Django.
Backport of 3f1412ff7b from master.
 2014-07-21 19:07:48 +02:00
Alex Gaynor 1d1debeed4 [1.7.x] Added a newline to appease flake8 
Backport of 037f81fedc from master
 2014-07-14 10:54:43 -04:00
Claude Paroz be38c5bcc8 [1.7.x] Fixed #22939 -- Delayed admin_static backend detection 
Thanks generalov for the report.

Backport of 22b2fb0b from master
 2014-07-12 18:50:32 +02:00
Claude Paroz 1bb8ccdb9e [1.7.x] Fixed pyinotify performance regression in 15f82c7011 
Refs #9722. Thanks Tim Graham for the review.
Backport of 6d302f639 from master.
 2014-07-06 21:45:09 +02:00
Daniel Hahler ef392387c2 [1.7.x] Fixed various minor doc typos / references. 
Backport of 67f9f385aa from master
 2014-07-05 20:26:56 -04:00
Tim Graham 088b30f49b [1.7.x] refs #22487: Don't flush out data from before normal TestCases (spatialite) 2014-06-24 06:43:40 -04:00
Uriel Corfa 68b89f4d13 [1.7.x] Removed 'to_field' from ForeignKey(settings.AUTH_USER_MODEL) in admin's initial migration. 
This enables using a custom user model with a primary key with a name
different than 'id'; refs #22889.

Backport of bcd2e6c697 from master
 2014-06-23 13:23:09 -04:00
Tim Graham aa10f57d94 [1.7.x] Fixed #22819 -- Renamed output_type -> output_field in query expression API. 
Thanks jorgecarleitao for the suggestion.

Backport of 95cc0e15b4 from master
 2014-06-17 12:06:12 -04:00
Tim Graham d36b54d753 [1.7.x] Added database migration for contrib.auth. 
refs #22170.

Backport of b341f33697 from master
 2014-06-16 16:23:28 -04:00
Tim Graham a0bf14a2ac [1.7.x] Added database migration for contrib.contenttypes. 
Moved contenttypes tests to allow them to run correctly in the presence of
migrations. refs #22170.

Backport of eb8600a656 from master
 2014-06-16 15:03:27 -04:00
Andrew Godwin a5fed757aa [1.7.x] Use __first__ not __latest__ for unknown app dependencies 2014-06-16 09:54:57 -07:00
Tim Graham a15bf2cd4e [1.7.x] Added database migration for contrib.sessions. 
refs #22170.

Backport of 37a8f5aeed from master
 2014-06-16 11:53:34 -04:00
Claude Paroz 380cafe5be [1.7.x] Added database migration for contrib.redirects. 
refs #22170.

Backport of d7576bb27a from master
 2014-06-15 21:15:17 -04:00
Claude Paroz ec7cddd361 [1.7.x] Added database migration for contrib.flatpages. 
refs #22170.

Backport of 7da16b99df from master
 2014-06-15 21:15:12 -04:00
Claude Paroz 534d9f1e82 [1.7.x] Added database migration for contrib.sites. 
refs #22170.

Backport of ec6e2eac60 from master
 2014-06-15 21:15:05 -04:00
Andrew Godwin c903543127 [1.7.x] Fixed #22563: Added migration to admin, fixed a few more loader issues. 2014-06-15 11:26:35 -07:00
mlavin d94de802d3 [1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults. 
Also added a compatibility check for changed middleware defaults.
 2014-06-13 12:40:42 -04:00
Tim Graham 0767055dfc [1.7.x] Fixed #22770 -- Removed create_superuser from post_migrate signals. 
Moved logic to syncdb command for backwards compatibility.

Backport of 93d05536fd from master
 2014-06-10 15:00:12 -04:00
Greg Chapple d232a5f93f [1.7.x] Fixed #22792 -- Updated checks for list_display_links in model admin 
Backport of d8f19bb3b6 from master
 2014-06-10 09:43:24 -04:00
Tim Graham 11f0bdc007 [1.7.x] Added rollback emulation to spatialite backend; refs #22487. 
Backport of 6b97ae3521 from master
 2014-06-09 14:43:13 -04:00
Claude Paroz d4623d13b7 [1.7.x] Fixed formtools tests with Python 2 
Fixes #19905 again.
Backport of 1aaf4053f5 from master.
 2014-06-09 10:32:27 +02:00
Aymeric Augustin 25f4e71ed3 [1.7.x] Gave unique names to SpatialRefSysModels. 
Prevented clashes in the app registry.

Fixed #22790. Thanks timo for the report.

Backport of 6e5651e from master
 2014-06-08 21:17:59 +02:00
Simon Charette 2b13576c8f [1.7.x] Fixed #22772 -- Defer wizard temporary files deletion. 
Backport of e2112edd9a from master
 2014-06-07 19:57:58 -04:00
Egor Semiguzov 206cb74cef [1.7.x] Removed erroneous trailing comma in OLMapWidget.js. 
Backport of c5226eb72a from master
 2014-06-03 07:44:39 -04:00
Tim Graham f8dd382a48 [1.7.x] Revert "Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices" 
This reverts commit 9d1987d767.

Backport of 5046c110cf from master
 2014-06-02 07:13:03 -04:00
Fabio Rueda ad408d0985 [1.7.x] Fixed syntax error in ogrinspect.py management command. 
Backport of f384b638e2 from master
 2014-06-01 13:22:15 -04:00
Simon Charette c95a3fadb7 [1.7.x] Fixed #22299 -- Cleanup wizard temp files when possible. 
Thanks to @erikr for the review.

Backport of fa8b473528 from master.
 2014-05-30 22:25:17 +02:00
Florian Apolloner e3792bb95f [1.7.x] Fixed #19905 -- Fixed leakage of file descriptors in form wizard. 
Backport of c4c2c99669 from master.
 2014-05-30 22:00:25 +02:00
Alex Gaynor 3d98941d5c [1.7.x] Fixed several typos in Django 
Backport of 1dcc603eff from master
 2014-05-29 07:53:02 -04:00
Denis Cornehl 0007a43198 [1.7.X] Fixed #22557 -- ManifestStaticFilesStorage did not cleanup deleted files. 
When using ManifestStaticFilesStorage, deleted static files would be
correctly cleaned up by "collectstatic --clear", but the manifest file
would still contain the stale entries.

Thanks to tedtieken for the report

Backport of 3bec38888f from master.
 2014-05-20 18:19:40 +02:00
Claude Paroz 3e2bb807b1 [1.7.x] Removed unused translations in auth tests 
Backport of b8c480a12b from master.
 2014-05-20 12:23:17 +02:00
Claude Paroz 0f84037e10 [1.7.x] Updated translation catalogs 2014-05-19 15:14:09 +02:00
Tim Graham 1e78d132da [1.7.x] Fixed #22652 -- Replaced UserModel.objects with UserModel._default_manager. 
Thanks alexdlaird for the report.

Backport of b68fac7e88 from master
 2014-05-19 08:37:00 -04:00
Claude Paroz a69534ddd4 [1.7.x] Removed locale dirs for single-message apps 
Considering that these apps only translate their app name, it's not
worth having a whole bunch of po files just for that. The translatable
app name for those apps will be integrated in Django core catalog.
Backport of a1f0c4c697 from master.
 2014-05-19 14:21:01 +02:00
Stas Rudakou 75d2da797e [1.7.x] Fixed #22266 - quote PK before redirecting away from add_view (django.contrib.admin) 
Backport of ebd70d4d00 from master.
 2014-05-16 18:38:26 +02:00
Claude Paroz e8a7436941 [1.7.x] Harmonized some PEP 0263 coding preambles 
Backport of e520a73ee from master.
 2014-05-15 20:01:31 +02:00
Anders Steinlein 2914f66983 [1.7.x] Fixed #17642 -- Added min_num support to modelformsets, inlines, and the admin. 
Thanks Stephen Burrows for work on the patch as well.
 2014-05-15 07:02:06 -04:00
Erik Romijn e7b0cace45 [1.7.x] Added additional checks in is_safe_url to account for flexible parsing. 
This is a security fix. Disclosure following shortly.
 2014-05-14 10:18:27 +02:00
Claude Paroz 9d0ebceb32 [1.7.x] Fixed #21685 -- Displayed app verbose name in admindocs model index 
Backport of 4cf82e5bcf from master.
 2014-05-10 18:10:05 +02:00
Ramiro Morales bc82c0dbac [1.7.x] Restored site header text in password reset view. 
It's the one shown when the optional integration described in
https://docs.djangoproject.com/en/dev/ref/contrib/admin/#adding-a-password-reset-feature
is used.

Follow-up to commits 6f470650d0 and 1d42a86ec7, together they fix
different small UI regressions after a962286b74.

Refs #21293.

5ea34f3f86 from master.
 2014-05-07 23:32:36 -03:00
Alex Gaynor 996564df4d [1.7.x] Fix many many typos in comments throughout the codebase 
Backport of 2bcb8bfc8d from master
 2014-04-26 14:35:57 -04:00
Tim Graham 6d87acc390 [1.7.x] Fixed #22515 -- Fixed the object_id of the LogEntry that's created after a user password change in the admin. 
Thanks ross at servercode.co.uk for the report.

Backport of 9e7f86b890 from master
 2014-04-25 08:36:20 -04:00
Claude Paroz c3228ef3e2 [1.7.x] Added Spatialite support to the new migration framework 
Refs #22451.
Backport of 2ffa6ca73a from master.
 2014-04-23 13:48:36 +02:00
Claude Paroz 423e2cf1ea [1.7.x] Used migration framework in GIS test tearDown 
Backport of 48c4ea414 from master.
 2014-04-23 13:47:49 +02:00
Claude Paroz 1d0f1ee199 [1.7.x] Fixed table cleanup in GIS migration tests 
Backport of ab90c4707b from master.
 2014-04-22 19:52:58 +02:00
Claude Paroz 417e9f383f [1.7.x] Fixed removal of GIS column in PostGIS 1.x migration 
Refs #22481.
Backport of 2f9d1576e from master, squashed with 2f9d1576e8.
 2014-04-22 19:52:58 +02:00