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

3349 Commits

Author SHA1 Message Date
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
Claude Paroz 5c19c698b1 [1.7.x] Fixed adding new GIS column in PostGIS 1.x migration 
Refs #22451.
Backport of fb09a489c from master.
 2014-04-22 19:52:58 +02:00
Florian Apolloner 97b5833e21 [1.7.x] Fixed #22426 -- Added support old-style d.c.messages format. 
Forward ported code from 1.5 that adds backwards compatibility with legacy message length.
See commit 9e7183073f for details.

Thanks to Ofir Ovadia for the initial patch.

Backport of f286721f7f from master.
 2014-04-22 10:47:26 +02:00
Aymeric Augustin 62eb79fc4c [1.7.x] Appeased flake8 2.1.0. 
Backport of 428c0bbe1b from master
 2014-04-21 07:50:50 -04:00
Alex Gaynor 50dddbdfc7 [1.7.x] Corrected many style guide violations that the newest version of flake8 catches 
Backport of 778ce245dd from master
 2014-04-21 07:50:43 -04:00
Tim Graham 548acd77fd [1.7.x] Fixed a KeyError on login with legacy sessions; refs #21649. 
Thanks Loic for the report.

Backport of 11e30b684d from master
 2014-04-17 20:07:05 -04:00
Claude Paroz f039c555ca [1.7.x] Fixed #22456 -- Replaced 900913 EPSG code by 3857 in some tests 
3857 is now the official EPSG code for the Google spherical mercator
projection and some recent versions of GDAL do not recognize 900913
any longer.
Thanks Tim Graham for the report and initial patch.
Backport of c082f3c74c from master.
 2014-04-17 21:21:27 +02:00
John Paulett b4681be154 [1.7.x] Fixed #22364 -- Sanitized getpass input in changepassword. 
Python 2 getpass on Windows does not accept unicode, even
when containing on ASCII characters. Related #190807.

Backport of b5a9166f7e from master
 2014-04-10 13:16:04 -04:00
Tim Graham 32e6237450 [1.7.x] Fixed #22195 -- Used constants to define built-in tags for check framework. 
Thanks Elvard for the patch.

Backport of b513fa5fc6 from master
 2014-04-10 08:54:32 -04:00
Tim Graham 32c8579089 [1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries. 
(the previous commit included only the test)

Backport of 3cba90f22a from master
 2014-04-07 09:06:09 -04:00
Tim Graham 5891fd3f89 [1.7.x] Fixed #21649 -- Added optional invalidation of sessions when user password changes. 
Thanks Paul McMillan, Aymeric Augustin, and Erik Romijn for reviews.

Backport of fd23c06023 from master
 2014-04-05 13:01:03 -04:00
Vishal Lal 28a686a0b7 [1.7.x] Fixed #22372 -- Improved description of WizardView.get_context_data(). 
Thanks simon29 for the report.

Backport of a8e2ec0e82 from master
 2014-04-03 08:27:57 -04:00
Tim Graham ef37346932 [1.7.x] Fixed #22362 -- Improved AuthenticationMiddleware assertion message. 
Thanks Keryn Knight.

Backport of 246face209 from master
 2014-03-31 08:12:16 -04:00
Tim Graham 07c42cee7f [1.7.x] Replaced urllib/urlparse imports with from django.utils.six.moves. 
Backport of 981b864fbd from master
 2014-03-31 07:55:25 -04:00
Loic Bistuer 5268d71f18 [1.7.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes. 
Thanks to trac username honyczek for the report. Refs #6903.

Backport of 4339e9a92d from master
 2014-03-31 07:20:20 -04:00
Anssi Kääriäinen a6a0800579 [1.7.x] Fixed #22250 -- regression in gis compiler for non-concrete fields 
Thanks to gwahl@fusionbox.com for the report.

Backport of 21f208e66e from master
 2014-03-29 08:28:43 +02:00
Chris Beaven fe61ba91c7 [1.7.x] Add a useful stacklevel to some RemovedInDjango19Warnings 
Backport of b077ba7ac1 from master
 2014-03-27 06:11:01 -04:00
David Evans ddcbde41ee [1.7.x] Fixed #22315 -- str/bytes mismatch in staticfiles 
Previously, `ManifestFilesMixin.read_manifest` failed in Python 3
because `json.loads` accepts `str` not `bytes`.

Backport of 86dcac4634 from master
 2014-03-25 09:55:29 -04:00
Ben Davis 2460484486 [1.7.x] Fixed #22087 -- Made AdminReadonlyField respect ModelForm Meta overrides. 
Backport of 16afffffe8 from master
 2014-03-25 09:34:12 -04:00
Jannis 345281b880 [1.7.x] Fixed typo in error message in django.contrib.sitemaps. 
Backport of d81a9c50d8 from master
 2014-03-24 13:06:58 -04:00
Claude Paroz d345a030c2 [1.7.x] Fixed #22241 -- Selectively added line breaks in admin read-only fields 
When content is supposed to contain HTML, we do not try to add
line breaks in read-only contents.
Thanks Alexander Todorov for the report.
Backport of c94bff2 from master.
 2014-03-22 17:11:12 +01:00
Andrew Godwin 356f064c49 Merge pull request #2221 from bmispelon/LazyObject-refactor 
Fixed #21840 -- Moved dunder methods from SimpleLazyObject to LazyObject...
 2014-03-19 21:01:24 -07:00
Eric Palakovich Carr c11b9346d4 Fixed migration so MySQL GIS test doesn't fail; refs #22001. 
The test previously failed with the error:
(1170, "BLOB/TEXT column 'name' used in key specification without a key length")
 2014-03-19 06:49:29 -04:00
Florian Apolloner 8520e43e13 Fixed a regression from 2e5b82f627 2014-03-18 15:30:52 +01:00
Florian Apolloner 2e5b82f627 Made a test app label unique. 2014-03-18 14:51:06 +01:00
Marc Tamlyn 834d78ffc3 Remove u prefixes, skip test unless spatial db. 
Refs #22001, d22b291890
 2014-03-15 12:49:03 +00:00
Marc Tamlyn d22b291890 Fixed #22001 -- Ensure db_type is respected. 
db_parameters should respect an already existing db_type method and
return that as its type string. In particular, this was causing some
fields from gis to not be generated.

Thanks to @bigsassy and @blueyed for their work on the patch.

Also fixed #22260
 2014-03-14 22:32:17 +00:00
Baptiste Mispelon 5c5b266b54 Simplified implementation of collectstatic command. 
Since d2e242d16c6dde6f4736086fb38057424bed3edb made isinstance()
calls work correctly on LazyObject, we can simplify the
implementation of is_local_storage added in
7e27885c6e.
 2014-03-13 10:03:01 +01:00