test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,211 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

18211 Commits

Author SHA1 Message Date
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
Tim Graham fdcef1b863 [1.7.x] Fixed #23491 -- Clarified tutorial 3. 
Thanks diek for the suggestion.

Backport of 54fd84e432 from master
 2014-09-17 08:42:55 -04:00
Joseph Dougherty 722516536e [1.7.x] Fixed #23499 -- Error in built-in template tag "now" documentation 
Backport of ab8248361e from master.
 2014-09-17 09:23:20 +02:00
Tim Graham 3f6430d084 [1.7.x] Added 1.7.1 release notes for refs #23492. 
Backport of 92a8213fdb from master
 2014-09-16 08:32:55 -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
Tim Graham 68ab3b1ac1 [1.7.x] Fixed #23486 -- Corrected makemigrations output in tutorial 1. 
Thanks nmarler for the report.

Backport of 0d1561d197 from master
 2014-09-15 20:28:49 -04: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
Tim Graham d1190a1646 [1.7.x] Forwardported 1.4.16 release notes. 
Backport of 0ae79014c0 from master
 2014-09-13 09:23:40 -04:00
Tim Graham 4b8798cfb9 [1.7.x] Added 1.7.1 release notes for refs #23483. 
Backport of 08042f1a73 from master
 2014-09-13 09:22:26 -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
Gabe Jackson d321218a52 [1.7.x] Added link to LogRecord attributes in logging.txt 
Backport of c5b4145fca from master
 2014-09-11 15:42:40 -04:00
Tim Graham a358e8dc44 [1.7.x] Added some items to the 1.7.1 release notes. 
Backport of cc5e81c46d from master
 2014-09-10 13:26:01 -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
Tim Graham 2e749f247c [1.7.x] Fixed typo in topics/forms/formsets.txt 
Backport of e265112cd1 from master
 2014-09-10 11:17:54 -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
Iain Dawson c2fe985733 [1.7.x] Fixed an instance of 'an' before a word beginning with a consonant. 
Backport of ef8ef2a42d from master
 2014-09-10 07:17:31 -04:00
Greg Brown 77ec85adae [1.7.x] Note re migrations importing custom fields 
Backport of b4d486c80f from master
 2014-09-09 20:10:00 -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
Sébastien Fievet 987fce90bf [1.7.x] Fixed missing trailing parenthesis in docs/releases/1.7.txt 
Backport of e5ae03fd5a from master
 2014-09-09 10:05:28 -04:00
Tim Graham 84b50718ab [1.7.x] Fixed #23350 -- Updated mod_wsgi auth example to use less memory. 
Thanks Graham Dumpleton for the report.

Backport of c7f7432be5 from master
 2014-09-09 09:32:59 -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 1f1a329288 [1.7.x] Fixed broken test from da160d440f; refs #23418. 
Backport of 16548cfc7c from master
 2014-09-08 16:51:34 -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
Octowl 813619405b [1.7.x] Fixed #23307 -- Clarified the way max_num limits the output of formsets. 
Thanks velle for the report.

Backport of 5f3806b861 from master
 2014-09-08 13:24:38 -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
Sébastien Fievet 267b121b1e [1.7.x] Fixed typo in docs/howto/custom-lookups.txt. 
Backport of f36ab2d3f2 from master
 2014-09-07 06:29:52 -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
Aymeric Augustin f8fdb7177b [1.7.x] Fixed #23437 -- Documented required update of WSGI scripts for 1.7. 
Thanks Tim for the review.

Backport of dfe209a from master
 2014-09-06 19:03:14 +02:00
Collin Anderson ba8983333a [1.7.x] Refs #23430 -- gunicorn wants a module, not file 
Backport of fa74dba994 from master
 2014-09-06 12:21:36 -04: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
Tim Graham 2b48171081 [1.7.x] Fixed #23438 -- Added snippet & imports to docs/intro/overview.txt. 
Backport of 88c4e01d34 from master
 2014-09-06 07:36:02 -04:00
oromero af28f3c175 [1.7.x] Fixed #22161 -- Documented send() with no recipients won't raise an exception. 
Backport of 0f0a5c07f9 from master
 2014-09-05 20:40:49 -04:00
Collin Anderson fee499c80b [1.7.x] Fixed #23430 -- simplified gunicorn deployment docs. 
Backport of 77b3907d6d from master
 2014-09-05 20:36:56 -04:00
Patrick Beeson d4ef9a4a21 [1.7.x] Fixed #23427 -- Documented migrate is required before runserver for default projects. 
Backport of fb545e5a27 from master
 2014-09-05 20:00:36 -04:00
Andrew Godwin de3a3096d8 [1.7.x] Fix Python 3 incompatability 2014-09-05 15:48:20 -07: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 e5cdfb1510 [1.7.x] Update docs to be more clear about nested classes (refs #23418) 2014-09-05 15:37:53 -07:00
Tim Graham 5e2f336f69 [1.7.x] Fixed #23414 -- Updated version numbers in release process doc. 
Thanks jaap3 for the report.

Backport of 5c5011ce68 from master
 2014-09-05 15:44:56 -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
Andrew Godwin ffa9e60638 [1.7.x] Fixed #22534: Reinforce swappable documentation 2014-09-05 11:41:22 -07:00
Nikolaus Schlemm d0c6016367 [1.7.x] cater for running tests from another directory than tests - applying existing pattern to newly added test_testcase_ordering as well 
Backport of d11e836203 from master
 2014-09-05 14:35:00 -04:00