mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
15,383 Commits 30 Branches 460 Tags
66bf6b3f857fea1114f13fbccdb66258e43a6a05
Commit Graph

1406 Commits

Author SHA1 Message Date
Claude Paroz
66bf6b3f85 [1.6.x] Fixed #21373 -- Typo fixed in i18n docs 
Thanks rpq at winscores.com for the report.
Backport of 88b9d4ff3a from master.
 2013-11-02 19:15:20 +01:00
Tim Graham
33503c57ef [1.6.x] Fixed spelling ("dependant" -> "dependent") 
Dependent means reliant on.
A dependant is a person like a child or spouse.

Thanks Andrew Wilcox for the report.

Backport of 090315f5df from master
 2013-11-01 21:32:05 -04:00
Sylvain Bellemare
35fd14cf42 [1.6.x] Fixed typo -- "a" user, not "an" user 
Backport of c7dabe49dd from master
 2013-11-01 19:28:19 -04:00
Tim Graham
1cdf7f83ff [1.6.x] Fixed #21294 -- Clarified the logout next_page argument. 
Thanks wim at go2people.nl for the report.

Backport of 51e6575472 from master
 2013-10-30 09:26:35 -04:00
Antoine Catton
142757c61e [1.6.x] Documented the limitation on sep argument to Signer 
Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com>

Backport of e9a356a695 from master
 2013-10-30 08:27:19 -04:00
Tim Graham
747f77552a [1.6.x] Fixed #21325 -- Added missing argument to permission_required decorator. 
Backport of cc2049cdd7 from master
 2013-10-25 17:37:39 -04:00
Tim Graham
4499dc81e2 [1.6.x] Fixed #21304 -- Typo in docs/topics/testing/advanced.txt 
Thanks joao at silvaneves.org for the report.

Backport of 9704c49d59 from master
 2013-10-22 12:06:16 -04:00
Tim Graham
86373dc63e [1.6.x] Added docs for the hasher's iteration count changes. 
Backport of 28b70425af from master.
 2013-10-21 20:33:27 +02:00
Tim Graham
5bb975a139 [1.6.x] Added a warning regarding session security and subdomains. 
Backport of a3372f67cb from master
 2013-10-18 09:44:29 -04:00
Tianyi Wang
1241a2cc10 [1.6.x] Improvement on InlineFormSet doc, refs #21006 
Backport of 944a2bb7c1 from master
 2013-10-15 09:58:51 -04:00
Tianyi Wang
ecfd958c84 [1.6.x] Fixed #21006 -- Added example code for overriding methods on an InlineFormSet. 
Thanks treysta at gmail.com for the suggestion.

Backport of 9bfe66164e from master
 2013-10-15 07:36:37 -04:00
Sorcha Bowler
07ebd23254 [1.6.x] Fixed #21223 -- Added form.id_for_label to topic guide. 
Thanks ebertti at yahoo.com.br for the suggestion.

Backport of 018e2c055a from master
 2013-10-14 18:43:29 -04:00
Loic Bistuer
8222a48253 [1.6.x] Clarfied the ModelForm docs with respect to generated vs. declared fields. 
The ModelForm docs suggested that fields defined declaratively override
default fields generated from the form Meta.

This is conceptually wrong, especially with inheritance in mind. Meta is
usually defined on the topmost ModelForm subclass, while fields can come
from anywhere in the MRO, especially base classes; therefore we suggested
that something defined in a base class override something from a subclass.

This patch rephrases the docs around the idea that Meta is used to generate
*missing* fields.

Refs #8620, #19617.

Thanks @mjtamlyn and @timgraham for the review.

Backport of 54cd930baf from master
 2013-10-14 10:55:41 -04:00
Bouke Haarsma
e3c8db61f3 [1.6.x] Fixed #21264 -- Incorrect RST usage in docs 
Backport of 8fc63087f6 from master
 2013-10-14 08:15:50 -04:00
Aymeric Augustin
ddff6522fa [1.6.x] Fixed #19560 -- Identified field in warning for naive datetime. 
Thanks gcc for the report and vajrasky for the patch.

Backport of 570d9c2678 from master.
 2013-10-13 11:58:12 +02:00
Tim Graham
8f5d3d16cb [1.6.x] Fixed #15582 -- Documented how TransactionTestCase.multi_db affects fixtures. 
Thanks slinkp for the suggestion.

Backport of dd839a2dfd from master
 2013-10-11 20:12:52 -04:00
Cody Scott
f787869d8c [1.6.x] Minor edits to docs/topics/db/queries.txt. 
Backport of 8bfc7cc64c from master
 2013-10-11 15:35:48 -04:00
Cody Scott
2069dfeaef [1.6.x] Small improvements to docs/topics/db/models.txt 
Backport of 695bc0d191 from master
 2013-10-10 20:57:16 -04:00
Claude Paroz
7a58fde7a6 [1.6.x] Fixed grammar/typos in auth customization docs 
Backport of 1b9c72fc4f from master.
 2013-10-09 16:22:36 +02:00
Dan Loewenherz
af46932b57 [1.6.x] Fix grammatical errors in email documentation 
Backport of 43f213e475 from master
 2013-10-08 20:30:43 -04:00
Russell Keith-Magee
1ab84b6c65 [1.6.x] Fixed #21164 -- Added documentation for issue with test users. 
The package renaming restores the older package names (which were also the
documented package names). This doesn't affect test discovery because the
module in question doesn't contain any tests.

Thanks to Carl for the design discussion.

Backport of ddb5385 from master.
 2013-10-08 10:37:48 +08:00
Ramiro Morales
563b5c2000 [1.6.x] Re-added link to SQLite notes from DB section of install doc. 
67f5dffbec from master.
 2013-10-07 07:42:28 -03:00
Tim Graham
06b149e220 [1.6.x] Fixed #10913 -- Documented how related_name affects QuerySet filtering 
Thanks neithere for the suggestion.

Backport of 75bb6ba966 from master
 2013-10-02 12:13:44 -04:00
Tim Graham
9b89fcc0b0 [1.6.x] Clarified session replay attack differences with cookie backend. 
Backport of 00a0d3de02 from master
 2013-10-02 10:15:36 -04:00
Aymeric Augustin
0d74bdaf0c Fixed #21134 -- Prevented queries in broken transactions. 
Backport of 728548e4 from master.

Squashed commit of the following:

commit 63ddb271a44df389b2c302e421fc17b7f0529755
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 29 22:51:00 2013 +0200

    Clarified interactions between atomic and exceptions.

commit 2899ec299228217c876ba3aa4024e523a41c8504
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 22 22:45:32 2013 +0200

    Fixed TransactionManagementError in tests.

    Previous commit introduced an additional check to prevent running
    queries in transactions that will be rolled back, which triggered a few
    failures in the tests. In practice using transaction.atomic instead of
    the low-level savepoint APIs was enough to fix the problems.

commit 4a639b059ea80aeb78f7f160a7d4b9f609b9c238
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Tue Sep 24 22:24:17 2013 +0200

    Allowed nesting constraint_checks_disabled inside atomic.

    Since MySQL handles transactions loosely, this isn't a problem.

commit 2a4ab1cb6e83391ff7e25d08479e230ca564bfef
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sat Sep 21 18:43:12 2013 +0200

    Prevented running queries in transactions that will be rolled back.

    This avoids a counter-intuitive behavior in an edge case on databases
    with non-atomic transaction semantics.

    It prevents using savepoint_rollback() inside an atomic block without
    calling set_rollback(False) first, which is backwards-incompatible in
    tests.

    Refs #21134.

commit 8e3db393853c7ac64a445b66e57f3620a3fde7b0
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 22 22:14:17 2013 +0200

    Replaced manual savepoints by atomic blocks.

    This ensures the rollback flag is handled consistently in internal APIs.
 2013-09-30 10:14:22 +02:00
Tim Graham
d1047c8b4c [1.6.x] Fixed #21116 -- Made usage of manage.py in docs more consistent. 
Thanks daniel.quattro at gmail.com for the report.

d1c9802811 from master.
 2013-09-25 21:11:17 -03:00
Tim Graham
d30d66b907 [1.6.x] Fixed #21137 -- Corrected ULRconf include example. 
Thanks marfire for the report.

Backport of 77f6b468e5 from master
 2013-09-24 09:41:39 -04:00
Tim Graham
34f4053409 [1.6.x] Removed implication that six is part of Python stdlib. 
Backport of 45969bdeb5 from master
 2013-09-23 18:30:18 -04:00
Daley Chetwynd
5e549e7efe [1.6.x] Fixed #20830 -- Clarified that Django uses a customized version of six. 
Thanks glarrain for the suggestion.

Backport of a53caf28bf from master
 2013-09-23 11:07:36 -04:00
Ramiro Morales
b2876c0c91 [1.6.x] A few doc additions for changes from d228c1192e. 
ce0c5c38ea from master.
 2013-09-22 13:54:54 -03:00
Ramiro Morales
aef809f90c [1.6.x] Reference Meta.index_together in DB performance guide. 
9dc45efeba from master.
 2013-09-22 13:54:02 -03:00
Michael DiBernardo
bb8a087949 [1.6.x] Fixed #21137 -- Documented best practice for URLconfs with repeated pattern prefixes. 
Backport of 222460a994 from master
 2013-09-21 18:18:16 -04:00
Aymeric Augustin
0ad178c43d [1.6.x] Clarified why one must not catch database errors inside atomic. 
Backport of 4db2752 from master.
 2013-09-20 21:57:39 +02:00
Markus Amalthea Magnuson
9888bb28ee [1.6.x] Added missing "in" in sentence. 
Backport of 2c5c422d34 from master
 2013-09-19 13:29:48 -04:00
Ramiro Morales
c0625a74ce [1.6.x] Reworded a paragraph in the logging docs. 
9d12f68a53 from master.
 2013-09-16 17:52:13 -03:00
Tim Graham
b05639dcac [1.6.x] Fixed #20887 -- Added a warning to GzipMiddleware in light of BREACH. 
Thanks EvilDMP for the report and Russell Keith-Magee
for the draft text.

Backport of da843e7dba from master
 2013-09-11 08:18:48 -04:00
Kevin Christopher Henry
4f0ea1aca4 [1.6.x] Documentation -- Improved description of cache arguments 
- Fixed some grammar and formatting mistakes
- Added the type and default for CULL_FREQUENCY
- Made the note on culling the entire cache more precise. (It's actually
  slower on the filesystem backend.)

Backport of 5eca021d48 from master
 2013-09-11 07:43:24 -04:00
Aymeric Augustin
f9f792eb04 [1.6.x] Took advantage of django.utils.six.moves.urllib.*. 
Backport of 6a6428a36 from master.
 2013-09-10 21:29:31 +02:00
e0ne
276e053803 [1.6.x] Fixed #16895 -- Warned about cost of QuerySet ordering 
Thanks outofculture at gmail.com for the suggestion.

Backport of cbf08c6b0c from master
 2013-09-09 09:49:15 -04:00
Tim Graham
c03848b540 [1.6.x] Fixed #21068 -- Added some docs for DiscoverRunner 
Thanks jcd.

Backport of e4b012feeb from master
 2013-09-07 16:11:03 -04:00
Tim Graham
2ab2d0fb25 [1.6.x] Fixed a link in topics/testing/overview.txt 
Backport of 0c295a7718 from master
 2013-09-06 17:41:43 -04:00
Tim Graham
da44a8bdc2 [1.6.x] Fixed #20646 -- Clarified the use of AbstractBaseUser.REQUIRED_FIELDS 
Thanks craigbruce.

Backport of db3de52807 from master
 2013-09-06 16:06:46 -04:00
Eric Boersma
180b9955cc [1.6.x] Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.

Backport of 4d13cc56de from master
 2013-09-05 20:16:14 -04:00
Aymeric Augustin
115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0. 
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.
 2013-09-03 07:34:45 -05:00
Tim Graham
c0fb6bdde3 [1.6.x] Fixed #21002 -- Documented JSON session serialization requires string keys 
Thanks jeroen.pulles at redslider.net for the report.

Backport of 3baf1d1042 from master
 2013-09-03 07:49:59 -04:00
Loic Bistuer
64383e8349 [1.6.x] Made the doc about translating string literals in templates more prominent. 
Backport of 9885f07757 from master
 2013-08-31 08:00:33 -04:00
Phaneendra Chiruvella
68eca2b36f [1.6.x] Minor spelling correction in ModelForms docs 
Backport of 2fbf949760 from master
 2013-08-28 07:12:38 -04:00
Krzysztof Jurewicz
544a190ebf [1.6.x] Fixed #20981 -- Noted the default value of disable_existing_loggers. 
Backport of 095643e691 from master
 2013-08-27 10:27:44 -04:00
Jan Böcker
c4e2e4f630 [1.6.x] Fixed typo in docs/topics/conditional-view-processing.txt 
Backport of 5fd2c979cb from master
 2013-08-27 09:22:31 -04:00
Ramiro Morales
2a166623a6 [1.6.x] Typos introduced in 57c82f909b. 2013-08-22 22:33:59 -03:00