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

11030 Commits

Author SHA1 Message Date
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
Malte Beckmann d4c68c46aa [1.7.x] Fixed #23417 -- Completed locale formats for zh_CN, zh_Hans, zh_Hant and zh_TW. 
Backport of 1ac32e76ac from master
 2014-09-17 11:18:10 -04:00
Duncan Parkes 40ce3efda2 [1.7.x] Overhauled the Welsh formats.py file. 
Backport of df7187d795 from master
 2014-09-17 11:14:11 -04:00
Baptiste Mispelon 04e7c7d51f [1.7.x] Fixed #23492 -- Restored F.__deepcopy__. 
This reverts commit 3a66035107.
A regression test was also added.

Backport of d63ac5b595 from master.
 2014-09-16 12:24:01 +02:00
valtron 563eaf0499 [1.7.x] Fixed #23474 -- Prevented migrating backwards from unapplying the wrong migrations. 
Backport of abcf28a076 from master
 2014-09-15 15:06:21 -04:00
Claude Paroz 31309d4722 [1.7.x] Fixed #23478 -- Complemented sqlmigrate command help 2014-09-13 09:47:14 +02:00
Carl Meyer ac1adfbe4a [1.7.x] Fixed #23483 -- Prevented ImproperlyConfigured with dotted app names 
Made sure the app labels stay unique for the AppConfigStubs, so
migrations wouldn't fail if two dotted app names has the same last part
(e.g. django.contrib.auth and vendor.auth)

Backport of 5e32605ce9 from master.
 2014-09-12 15:34:42 -06: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 4500784b24 [1.7.x] Avoided using deprecated version of importlib; refs #23418. 
Backport of fbeb7979ee from master
 2014-09-10 13:10:39 -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
Markus Bertheau 35cd0854f9 [1.7.x] Corrected grammar in migrations error message. 
Backport of 61f56e239f from master
 2014-09-10 10:34:32 -04:00
Markus Holtermann 67872bfff1 [1.7.x] Fixed #23452 -- Prevented infinite migrations for empty unique/index_together. 
Thanks fwkroon for the report.

Backport of 6d5958c7a3 from master
 2014-09-10 07:57:31 -04:00
Aymeric Augustin c981d9140d [1.7.x] Fixed #22920 -- Avoid masking some exceptions. 
If loading an application trigger an ImportError, the details of that
error were lost in some cases. Thanks Ben Davis for the report.

Backport of b161c01 from master
 2014-09-09 20:54:07 +02:00
Tim Graham a8ded528b3 [1.7.x] Fixed #11775 -- Made ABSOLUTE_URL_OVERRIDES work with models that don't define get_absolute_url(). 
Thanks jukvalim for the report and initial patch,
and Preston Timmons for review.

Backport of c32bc1a7a7 from master
 2014-09-09 11:07:41 -04:00
Tim Graham a0954a0681 [1.7.x] Fixed flake8 warning. 
Backport of 5cba975d26 from master
 2014-09-08 17:31:12 -04:00
Petras Zdanavičius a3e9e9e6c6 [1.7.x] Fixed #23451 -- Fixed typo in inlineformset_factory() error message. 
Backport of f7eee04ebe from master
 2014-09-08 17:22:49 -04:00
Markus Holtermann b0def3bcac [1.7.x] Fixed #23418 -- Fail when migration deconstruct produces invalid import 
Backport of d28b5f13b3 from master
 2014-09-08 15:41:14 -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
Andrew Pinkham 27e7972e63 [1.7.x] Fixed #22951 -- Checked for types during deep_deconstruct migration serializ 
Thanks Sam Hartsfield for the report.

Backport of 4680d25df2 from master
 2014-09-08 07:58:06 -04:00
Marc Tamlyn 48e1071007 [1.7.x] Fixed #23416 -- Make sure DatabaseCreation respects checks. 
Migrations respected Field.db_parameters()['check'], but
DatabaseCreation was still using just Field.db_type().

Backport of 14c8456 from master
 2014-09-06 19:02:28 +01:00
Tim Graham a932c596fc [1.7.x] Fixed #22882 -- Fixed a UnicodeDecodeError in flush. 
Thanks djbaldey for the report.

Backport of 0e4d79c4f0 from master
 2014-09-06 10:09:32 -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
Ben Reilly 4ca44d5e10 [1.7.x] switch out recursive dfs for stack based approach, to avoid possibly hitting the recursion limit 2014-09-05 15:39:47 -07: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
Tim Graham f030cdd402 [1.7.x] Post release version bump. 2014-09-02 21:08:28 -04:00
James Bennett d92b08536d [1.7.x] Bump version number for 1.7 release. 2014-09-02 16:08:20 -05:00
Dave Hall 7eabd22217 [1.7.x] Fixed #22918 -- Fixed SeparateDatabaseAndState crash 
Backport of e03b7940e5 from master
 2014-09-02 08:11:45 -04:00
Claude Paroz d839c75664 [1.7.x] Fixed #22820 -- Treated int and long types alike in lazy_number 
Thanks kwist for the report and the initial patch.
Backport of 5021421799 from master.
 2014-08-30 18:51:52 +02:00
Akis Kesoglou 3297f9e1ad [1.7.x] Fixed #23370 -- defer() + select_related() crashed with inherited models. 
Backport of 6613ea6e3f from master
 2014-08-30 07:16:42 -04:00
Simon Charette c32c220881 [1.7.x] Fixed #23379 -- Corrected a referencing issue in sql_create. 
Thanks to Trac alias flakfizer for the report.

Backport of 1e404180c1 from master
 2014-08-28 15:23:46 -04: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
Shai Berger 5d2b4669e8 [1.7.x] Made main user disconnect after creating test user/tablespaces on Oracle 
Backport of 4c85a0d95f from master
 2014-08-25 21:44:39 +03:00
Raffaele Salmaso 1a918806ca [1.7.x] Fixed #23341 -- Added migration name to nonexistent migration error in makemigrations. 
Backport of abd640fbdf from master
 2014-08-23 19:19:58 -04:00
Claude Paroz 46393980cf [1.7.x] Added new supported languages 2014-08-23 14:12:31 +02:00
Shai Berger 588f66d182 [1.7.x] Fixed schema test for Oracle 11.2.0.1 which is used in Django Project's CI. 
Refs #23073 Workaround.

Refs #22738 Repeats the mysql "offense". When the issue is solved, the
Oracle special case should be made to play with the solution (that is,
Oracle should be fixed the same way that mysql and the 3rd-party backneds
are).

Backport of 56252e7 from master
 2014-08-22 05:34:20 +03:00
James Bennett ad96254af9 [1.7.x] Bump version number for security release. 2014-08-20 15:25:35 -05:00
Markus Holtermann 2da20379c0 [1.7.x] Fixed #23322 -- Use resolved swappable model for dependency resolution during makemigrations 
Backport of 144cff3f51 from master
 2014-08-20 16:08:49 -04: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
Tim Graham 3123f8452c [1.7.x] Fixed #23157 -- Removed O(n) algorithm when uploading duplicate file names. 
This is a security fix. Disclosure following shortly.
 2014-08-20 14:42:48 -04:00
Florian Apolloner bf650a2ee7 [1.7.x] Prevented reverse() from generating URLs pointing to other hosts. 
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
Andrew Godwin 824e02bf83 [1.7.x] Fixed #23315: Operational dependency fail with mixed create/add 2014-08-19 19:51:23 -07:00
Claude Paroz 72ad014b6a [1.7.x] Fixed #22996 -- Prevented crash with unencoded query string 
Thanks Jorge Carleitao for the report and Aymeric Augustin, Tim Graham
for the reviews.
Backport of fa02120d36 from master.
 2014-08-19 22:30:22 +02:00