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

7027 Commits

Author SHA1 Message Date
Loic Bistuer 0e03d4618b [1.7.x] Removed confusing paragraph from the docs. 
This snippet wasn't particularly helpful as `add_error()` is described
in greater details in the following section.

Thanks Claude Paroz for the report.

Backport of f1f0c4f16b from master
 2014-11-05 16:06:20 +07:00
Tim Graham 109719a9cb [1.7.x] Updated six to 1.8.0. 
Backport of 81477c91f6 from master
 2014-11-04 21:22:45 -05:00
Tim Graham e7ec0af6fc [1.7.x] Fixed links to mysqlclient in database notes. 
Backport of e0685368c6 from master
 2014-11-04 07:36:18 -05:00
Tim Graham d373e223bd [1.7.x] Added a warning about nonexistent FK constraints when unmigrated apps depend on migrated ones. 
Thanks NotSqrt for the report; refs #23741.

Backport of f0ff452451 from master
 2014-11-04 07:27:53 -05:00
Berker Peksag c3b101fae5 [1.7.x] Fixed versionchanged indentation in docs/. 
Backport of 5c517ec218 from master
 2014-11-03 21:43:21 -05:00
Claude Paroz 378f94e39e [1.7.x] Confirmed Spatialite 4 support 
Backport of e62dea9ad5 from master
 2014-11-03 10:51:23 -05:00
Andy Chosak d3e71a6daa Clarified custom lookups output_field documentation 2014-11-03 16:00:34 +02:00
Andy Chosak 12e5b87b89 [1.7.x] Fixed #23420 - broken warning for unbound naive datetime objects 
Fixed issue with warning message displayed for unbound naive datetime
objects when USE_TZ is True. Adds unit test that demonstrates the issue
(discoverable when using a custom lookup in MySQL).

Backport of ceb1ffcc8d from master.

Conflicts:
	tests/custom_lookups/tests.py
 2014-11-03 15:59:17 +02:00
James Brewer 74d0311d6b [1.7.x] Fixed #23376 -- Clarified that certain Storage methods should be implemented but are not required. 
Backport of 332706eaa0 from master
 2014-11-03 07:18:48 -05:00
Tim Graham 3ac46d0726 [1.7.x] Fixed #23744 -- Fixed typo in selenium testing example. 
Thanks djbug for the report.

Backport of 6d0547c1ad from master
 2014-11-01 12:37:26 -04:00
Tim Graham 17205a98ed [1.7.x] Fixed #23731 -- Fixed migrations crash when adding blank GeometryFields on PostGIS. 
Thanks raratiru for the report and Claude Paroz for review.

Backport of d6d55368d4 from master
 2014-10-31 18:38:46 -04:00
Tim Graham e876c7f1ee [1.7.x] Fixed #23732 -- Corrected and enhanced select_related() docs. 
Thanks Daniele Procida for the report and review.

Backport of e958c760f9 from master
 2014-10-31 15:40:34 -04:00
Tim Graham c2cad66e47 [1.7.x] Added a warning about direct settings manipulation in tests. 
Thanks Thomas Chaumeny for the initial patch.

Backport of 3f651b3e88 from master
 2014-10-31 13:37:56 -04:00
Markus Holtermann 40ad022d5e [1.7.x] Fixed #23738 -- Allowed migrating from NULL to NOT NULL with the same default value 
Thanks to Andrey Antukh for the report.

Backport of 715ccfde24 from master
 2014-10-31 13:30:56 -04:00
Tim Graham 31d1ccca3f [1.7.x] Fixed #23735 -- Clarified that admindocs must be enabled to view template tag libraries in admin. 
Thanks Aymeric Augustin for the report.

Backport of 19242c675f from master
 2014-10-30 19:04:34 -04:00
Tim Graham f2de562235 [1.7.x] Fixed #23736 -- Corrected the description of the value that silent_variable_failure uses. 
Thanks Aymeric Augustin for the report.

Backport of e7cb4f2fba from master
 2014-10-30 18:44:51 -04:00
Tim Graham 01119c9c0f [1.7.x] Fixed #23737 -- Recommended the render() shortcut more strongly. 
Thanks Aymeric Augustin for the report.

Backport of f85fcc75e3 from master
 2014-10-30 18:35:15 -04:00
Tim Graham ee2e09864d [1.7.x] Fixed #23734 -- Replaced striptags in template filter overview since it has security implications. 
Thanks Aymeric Augustin for the suggestion.

Backport of 08c5887f13 from master
 2014-10-30 18:27:44 -04:00
Zan Anderle 30bd586a1c [1.7.x] Explained why admindocs omits model methods with arguments. 
Backport of 9e3aaa5a46 from master
 2014-10-30 18:19:48 -04:00
Aymeric Augustin aca514b7c4 [1.7.x] Removed extra period. 
Backport of 8f79c15 from master
 2014-10-30 20:50:00 +01:00
Berker Peksag 79b6717927 [1.7.x] Converted seealso directives to use 4 space indendation. 
Backport of affc04060f from master
 2014-10-30 14:46:27 -04:00
Tim Graham 9c9f35ed27 [1.7.x] Fixed #23152 -- Added support for transactional Spatialite metadata initialization. 
Thanks Doug Goldstein for the initial patch.

Backport of 57e40551e4 from master
 2014-10-30 13:58:02 -04:00
slollo ffd31c017f [1.7.x] Updated FIRST_DAY_OF_WEEK for Ukrainian to Monday. 
Backport of eab3dc195e from master
 2014-10-30 09:20:57 -04:00
David Hoffman d9bb7128fe [1.7.x] Fixed #23558 -- documented slugify limitations 
Backport of 03467368db from master
 2014-10-30 09:08:01 -04:00
Berker Peksag cb952099f4 [1.7.x] Fixed #23575 -- Added a code example for custom AdminSite. 
Backport of 4a9b4a23bd from master
 2014-10-30 08:51:39 -04:00
Raul Cumplido 9d1c5088bd [1.7.x] Fixed #23725 -- Substituted AUTH_USER_MODEL for User in docs. 
Backport of 68d3db8a7b from master
 2014-10-30 08:30:06 -04:00
P.A. SCHEMBRI 92628cc982 [1.7.x] Added cross reference in admin docs to topic about saving objects in formsets. 
Backport of 388c6038fd from master
 2014-10-29 13:39:18 -04:00
Markus Holtermann 21358e7225 [1.7.x] Fixed #23614 -- Changed the way the migration autodetector orders unique/index_together 
Thanks to Naddiseo for the report and Tim Graham for the review

Backport of 5c9c1e029d from master
 2014-10-29 13:16:23 -04:00
Tim Graham bb42bab6d3 [1.7.x] Fixed #23719 -- Fixed MySQL 5.6 crash with GeometryFields in migrations. 
Backport of 03bd79ed2 from master
 2014-10-29 08:25:59 -04:00
Oliver Meinusch 9766ed6a0e [1.7.x] Fixed QuerySet datetimes argument name in docs. 
Backport of 6b39401baf from master
 2014-10-27 19:49:50 -04:00
Tim Graham b7231e39a4 [1.7.x] Fixed #23708 -- Corrected mod_wsgi docs reference to nonexistent comment in wsgi.py. 
Thanks inglesp for the report.

Backport of e460b1c573 from master
 2014-10-27 18:20:18 -04:00
bahoo dea3eefa72 [1.7.x] Fixed typo in squashing migrations documentation 
Backport of af7d66b4f2 from master
 2014-10-27 17:53:34 -04:00
Claude Paroz a0cfd77971 [1.7.x] Added GeoDjango compatibility with mysqlclient driver 
Thanks Tim Graham for helping on that issue.
 2014-10-27 16:10:35 +01:00
Claude Paroz 6a1bd837b1 [1.7.x] Fixed #23717 -- Fixed makemessages crash when STATIC_ROOT=None 
Backport of 528c9af54 from master.
 2014-10-27 13:59:09 +01:00
Tim Graham 6149a0ab18 [1.7.x] Edited release note for refs #23621. 2014-10-27 07:13:23 -04:00
Tim Graham 5cc8180a65 [1.7.x] Fixed #23699 -- Prevented flush from loading initial data for apps with migrations. 
Backport of dd1ea70779 from master.
 2014-10-27 07:13:05 -04:00
Tim Graham e317d7fc72 [1.7.x] Fixed documentation of make_password kwargs. 
Backport of ed7c4df1ee from master
 2014-10-27 06:44:18 -04:00
Claude Paroz b42930e4b7 [1.7.x] Fixed #23446 -- Officially recommended mysqlclient as MySQL driver 
Thanks Corey Farwell for the report and Tim Graham for the review.
Thanks also to Inada Naoki for creating and maintaining mysqlclient.
Backport of 7f089ac2e3 from master.
 2014-10-27 09:17:31 +01:00
Loic Bistuer 7fa6781f81 [1.7.x] Fixed #23621 -- Warn for duplicate models when a module is reloaded. 
Previously a RuntimeError was raised every time two models clashed
in the app registry. This prevented reloading a module in a REPL;
while it's not recommended to do so, we decided not to forbid this
use-case by turning the error into a warning.

Thanks dfunckt and Sergey Pashinin for the initial patches.

Backport of 8c4ca16c65 and b62f72498a from master
 2014-10-26 00:12:17 +07:00
Berker Peksag 7227ec8ecc [1.7.x] Removed simplejson inventory file from docs/conf.py. 
Backport of 695956376f from master
 2014-10-25 08:21:49 -04:00
Tim Graham 03a20e5abd [1.7.x] Fixed #23692 -- Removed alpha/beta/rc release notes. 
Backport of 740934b507 from master
 2014-10-25 08:20:04 -04:00
Tim Graham 6f2658aa34 [1.7.x] Replaced dead links to python-distribute.org. 
Backport of dc241fdfdf from master
 2014-10-24 18:59:17 -04:00
Berker Peksag 17c09704ab [1.7.x] Fixed versionchanged indentation in topics/testing/advanced.txt. 
Backport of 1387c80643 from master
 2014-10-24 15:41:43 -04:00
James Doherty 69b5428c12 [1.7.x] Fixed typo in docs/ref/request-response.txt 
Backport of adf8fb34ce from master
 2014-10-24 07:49:47 -04:00
Tim Graham 7750fc8fa8 [1.7.x] Fixed #23702 -- Fixed adding an explicit id field on SQLite. 
Thanks gavinwahl for the report.

Backport of 92269b7b53 from master
 2014-10-23 14:35:55 -04:00
Tim Graham ba6a599ce4 [1.7.x] Fixed #23705 -- Removed unnecessary AliasMatch from example Apache config. 
Thanks Keryn Knight for the report.

Backport of 4b0a45ce64 from master
 2014-10-23 08:51:14 -04:00
Tim Graham f70a733abc [1.7.x] Fixed #23630 -- Made AlterModelTable rename auto-created M2M tables. 
Thanks Naddiseo for the report, Andrew Godwin for guidance,
and Shai Berger for review.

Backport of 41b337efa0 from master
 2014-10-23 08:51:08 -04:00
Berker Peksag 41d5222a6a [1.7.x] Fixed versionchanged indentation in unit-tests.txt. 
Backport of 22c85bf1a8 from master
 2014-10-23 08:04:17 -04:00
Tim Graham 7db89f79b3 [1.7.x] Added a warning about running migrations with DEBUG=True. 
Thanks Charles Lanahann for the report.
 2014-10-22 14:12:47 -04:00
Tim Graham 81095a1ae5 [1.7.x] Added stub release notes for 1.7.2. 
Backport of 4bf86d25e5 from master
 2014-10-22 13:39:27 -04:00
Tim Graham 0f9b4b5a90 [1.7.x] Added release dates to release notes. 
Backport of 9dc782b631 from master
 2014-10-22 12:24:13 -04:00
Claude Paroz d5a273eadb [1.7.x] Fixed #23583 -- More selectively ignored static/media roots 
Fixed a regression introduced by 28efafa24c.
Thanks Michal Čihař for the report and initial patch, and
Collin Anderson and Tim Graham for the reviews.
Backport of 8b4cc9df9c from master.
 2014-10-21 20:20:26 +02:00
Claude Paroz 53bc81dca3 [1.7.x] Fixed #21740 -- Allowed test client data to be an empty string 
This fixes a regression introduced by 2a31d00933.
Thanks tony-zhu for the report.
Backport of f0bb3c98cc from master.
 2014-10-21 09:17:42 +02:00
Tianyi Wang 3f3bed8fb9 [1.7.x] Fixed #23629 -- Allowed autodetector to detect changes in Meta.db_table. 
Thanks Naddiseo for reporting.

Backport of 5732424bee from master
 2014-10-20 13:15:34 -04:00
Tim Graham 417923c69e [1.7.x] Fixed #20609 -- Added instructions for using AnonymousUser with RequestFactory. 
Backport of a39df37049 from master
 2014-10-20 10:52:36 -04:00
wrwrwr a2ebbf8916 [1.7.x] Fixed a typo in urlencode documentation. 
Backport of 62a53bdf11 from master
 2014-10-19 19:20:28 -04:00
Jon Dufresne 37ab955d69 [1.7.x] Fixed #23676 -- Rearranged sentence; "by default" applies only to max length 
Backport of c1b9f99a81 from master
 2014-10-18 06:56:12 -04:00
Tim Graham 55a5f0b49a [1.7.x] Added 1.7.1 release notes for refs #23649. 
Backport of 6ce6c77e03 from master
 2014-10-17 08:57:15 -04:00
Tim Graham 0569e0dd74 [1.7.x] Fixed some intersphinx references. 
Backport of babbf18999 from master
 2014-10-16 20:02:23 -04:00
Tim Graham a1a54b00d2 [1.7.x] Fixed #23667 -- Incorrect settings reference for language cookie. 
Thanks jamesbeith for the report.

Backport of bedd439297 from master
 2014-10-16 19:42:05 -04:00
Rigel Di Scala e8262b5941 [1.7.x] Fixed #23615 -- Validate that a Model instance's "check" attribute is a method. 
The "check" name is a reserved word used by Django's check framework,
and cannot be redefined as something else other than a method, or the check
framework will raise an error.

This change amends the django.core.checks.model_check.check_all_models()
function, so that it verifies that a model instance's attribute "check"
is actually a method. This new check is assigned the id "models.E020".

Conflicts:
	docs/ref/checks.txt

Backport of a5c77417a6 from master
 2014-10-17 00:36:43 +07:00
mcgeeco b729ef0bda [1.7.x] Fixed #12008 -- Clarified relationship between template blocks and includes. 
Thanks Daniele Procida for suggested wording.

Backport of 80b8d3bee0 from master
 2014-10-16 10:54:35 -04:00
Ian Lee 813954f15a [1.7.x] Fixed pep8 in docs/topics/logging.txt 
Backport of 947af46db3 from master
 2014-10-15 18:56:00 -04:00
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
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
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
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