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

18325 Commits

Author SHA1 Message Date
Claude Paroz 6398ebab93 [1.7.x] Fixed #23638 -- Prevented crash while parsing invalid cookie content 
Thanks Philip Gatt for the report and Tim Graham for the review.
Backport of 59d487e7fc from master.
 2014-10-13 17:39:23 +02:00
Florian Apolloner bc13a08f89 [1.7.x] Fixed #23063 -- Convert \n and \r to \r\n when using the SMTP backend as per RFC. 
Backport of 8d789449c7 from master.
 2014-10-12 22:03:01 +02:00
Dori d2a2af67f7 [1.7.x] Fixed #23639 -- Fixed doc error in RegexValidator.regex 
Thanks to @claudep for the report and the original patch.

Backport of c48a29a02a from master.
 2014-10-12 13:02:27 +01:00
Tim Graham 625480cf08 [1.7.x] Fixed #23631 -- Removed outdated note on MySQL timezone support. 
Thanks marfire for the report.

Backport of 9db3653670 from master
 2014-10-10 15:22:36 -04: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
Markus Holtermann 71988ed953 [1.7.x] Fixed #23609 -- Fixed IntegrityError that prevented altering a NULL column into a NOT NULL one due to existing rows 
Thanks to Simon Charette, Loic Bistuer and Tim Graham for the review.

Backport of f633ba778d from master
 2014-10-09 22:41:27 +07:00
Rudy Mutter e31be40f16 [1.7.x] Fixed #23365 -- Added support for timezone-aware datetimes to migrations. 
Backport of a407b846b4 from master
 2014-10-09 22:39:17 +07:00
Ian Foote d830665007 [1.7.x] Fixed #23333 -- Made urlsafe_base64_decode() return proper type on Python 3. 
Backport of 03d89168a2 from master
 2014-10-08 14:03:46 -04:00
Tim Graham b2f7b517e5 [1.7.x] Fixed #23587 -- Clarified admin template overriding in tutorial 2. 
Thanks Petrus van Bork for the report.

Backport of e949f4435f from master
 2014-10-08 08:19:33 -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
Tim Graham dbd52f339c [1.7.x] Fixed #23607 -- Typo in docs/ref/contrib/staticfiles.txt. 
Thanks Rolandde for the report.

Backport of 87eedfff44 from master
 2014-10-06 17:46:26 -04:00
Tim Graham 96f022203a [1.7.x] Fixed #23593 -- Fixed crash in AdminEmailHandler with non-ASCII characters in request. 
Thanks edevil for the report and Simon Charette for review.

Backport of 9dff5ce7c7 from master
 2014-10-06 17:37:38 -04: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
Carl Meyer b3569b3a82 [1.7.X] Fixed #23602 -- Add comment on get_absolute_url regarding user input 
Backport of 04bd84786d from master.
 2014-10-06 11:30:33 -06:00
Loic Bistuer 082abce81e [1.7.x] Fixed #23594 -- Fixed deepcopy on ErrorList. 
Thanks Troy Grosfield for the report and Tim Graham for the tests.

Backport of ec2fd02bb3 from master
 2014-10-07 00:14:11 +07:00
Kostochko Dmitriy 2999bf055a [1.7.x] Updated links in admin docs to use :ref: 
per Sphinx docs: "Using ref is advised over standard reStructuredText
links to sections because it works across files, when section headings
are changed, and for all builders that support cross-references.

Backport of 13409b932a from master
 2014-10-06 10:46:43 -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
Ismail Badawi e9609fb7a1 [1.7.x] Fixed #23597 -- Clarified the manager that {Single,Multiple}ObjectMixin.model uses. 
Backport of e501d4c505 from master
 2014-10-06 08:24:07 -04:00
Tim Graham 0dbf366d90 [1.7.x] Revert "Improved AppRegistryNotReady message." 
This reverts commit 154f5f0de1.

Aymeric: "I chose not to talk about django.setup() here on purpose.
This will hardly always be the correct solution."

Backport of 8121860be4 from master
 2014-10-04 13:16:05 -04:00
Collin Anderson 154f5f0de1 [1.7.x] Improved AppRegistryNotReady message. 
Backport of 6fa9fa91a5 from master
 2014-10-04 08:24:18 -04:00
Erik Romijn d2f01afed0 [1.7.x] Made minor typographic correction to SECRET_KEY docs. 
Backport of 2bb00b0b0b from master.
 2014-10-04 10:34:50 +02:00
Erik Romijn ab8afafcc0 [1.7.x] Fixed #22310 -- Documented exact usage of SECRET_KEY 
Backport of 4ad57bbe31 from master.
 2014-10-04 09:25:11 +02:00
Luke Plant adae224572 [1.7.x] Documented how to rename get_query_set if you are a library author 
Backport of ca139bbfdf from master
 2014-10-02 11:34:19 +01:00
jnothman b21ec1ab6e [1.7.x] Added flat=False to signature of QuerySet.values_list() 
Backport of 20f868bc5a from master
 2014-10-01 13:10:14 -04:00
Alasdair Nicol 74c38bad1d [1.7.x] Fixed #23578 -- Changed examples in docs to use patterns 2014-10-01 01:23:53 +01:00
Claude Paroz e9c8aefbce [1.7.x] Updated translations from Transifex 2014-09-30 20:51:54 +02:00
Tim Graham 4743a94429 [1.7.x] Required numpy < 1.9 for tests; refs #23489. 2014-09-29 19:31:29 -04:00
Duane Hilton f0e7a695f5 [1.7.x] Fixed #17638 -- Added crosslinks between topic and reference guides. 
Thanks oinopion for the suggestion and jarus for the initial patch.

Backport of 054bdfeff1 from master
 2014-09-29 18:17:13 -04:00
Greg Brown f9e8da1542 [1.7.x] Fixed typo in docs/topics/db/managers.txt 
Backport of 9e8658db51 from master
 2014-09-29 07:46:24 -04:00
Loic Bistuer 7355885ef5 [1.7.x] Fixed #23560 -- Fixed MigrationWrite to handle builtin types without imports. 
Thanks Tim Graham for the review.

Backport of b23d47412c from master
 2014-09-27 00:40:35 +07:00
Carl Meyer 091289d950 [1.7.X] How many is two? 2014-09-26 11:24:09 -06:00
Carl Meyer d7bc30ffd2 [1.7.X] Fixed #23561 -- Corrected a security doc example that requires an unquoted HTML attribute. 
Thanks "djbug" for the report.
 2014-09-26 11:08:26 -06: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
Markus Holtermann e8a08514de [1.7.x] Fixed #23455 -- Forced related_name to be a unicode string during deconstruction. 
Backport of 45bd7b3bd9 from master
 2014-09-25 17:50:50 -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
Markus Holtermann 00c2a721e2 [1.7.x] Fixed #23415 -- Added fields for unmanaged and proxy model migrations. 
Thanks sky-chen for the report.

Backport of 215aa4f53b from master
 2014-09-25 10:28:11 -04:00
Claude Paroz b5d6092707 [1.7.x] Replaced input by textarea in forms docs 
Backport of 5066fda34d from master.
 2014-09-25 15:10:14 +02:00
Tim Graham d7b32d3120 [1.7.x] Revert "Fixed #23474 -- Prevented migrating backwards from unapplying the wrong migrations." 
Backport of d7ab2cefb7 from master
 2014-09-24 15:56:24 -04:00
Tim Graham 02aa3e30e9 [1.7.x] Fixed #23421 -- Corrected TEST SERIALIZE setting. 
Thanks gkoller for the report and Markus Holtermann for review.
 2014-09-24 14:49:46 -04:00
Markus Holtermann 5356183716 [1.7.x] Fixed #22959 -- Documented that class-based validators need to be deconstructible. 
Backport of c692e37b63 from master
 2014-09-24 14:33:57 -04:00
Markus Holtermann cf78a0ccc3 [1.7.x] Fixed #23473 -- Documented that @deconstructible classes need __eq__. 
Backport of 066e672d79 from master
 2014-09-24 14:19:43 -04:00
Tim Graham 40e5eb4114 [1.7.x] Corrected --noinput docs for makemigrations; refs #23407. 
Backport of 450a616004 from master
 2014-09-24 13:30:23 -04:00
Thomas Grainger bebdb026ce [1.7.x] Added SuspiciousOperation to list of caught exceptions in testing docs. 
Backport of 21683011d5 from master
 2014-09-24 13:05:06 -04:00
Markus Holtermann ae14c75014 [1.7.x] Fixed #23426 -- Don't require double percent sign in RunSQL without parameters 
Backport of b9a670b227 from master
 2014-09-24 07:21:50 -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
Sergey Fedoseev 991ec655b6 [1.7.x] Fixed #23503 -- Fixed renaming of model with self-referential m2m field. 
Backport of 463952d940 from master
 2014-09-23 10:12:10 -04:00
Sergey Fedoseev 58d7b84d53 [1.7.x] Fixed #23065 -- Quoted constraint names in SQL generated by migrations. 
Backport of 83cd18633f from master
 2014-09-23 10:11:58 -04:00
Sergey Fedoseev 09b5ff64b8 [1.7.x] Factored create_fk_sql, create_unique_sql, and delete_constraint_sql. 
Backport of 0bea6c8749 from master
 2014-09-23 10:11:29 -04:00