mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-01 20:16:43 +00:00
Code Issues 32 Releases Wiki Activity
15,913 Commits 29 Branches 438 Tags
Commit Graph

1536 Commits

Author SHA1 Message Date
Tim Graham
0114b9df13 [1.6.x] Updated six to 1.9.0. 
Backport of 52f0b2b62262743d5f935ddae29428e661b5d8ea from master
 2015-01-02 13:33:46 -05:00
Tim Graham
e17d98ff02 [1.6.x] Removed doc note about PasswordResetForm requiring an integer PK. 
This limitation was lifted in refs #14881.

Backport of a7aaabfaf1fa4c20065ab1133d49f40d4de6b409 from master
 2015-01-01 11:41:52 -05:00
Tim Graham
116d2098f6 [1.6.x] Fixed #24056 -- Fixed syntax highlighting in topics/testing/tools.txt. 
Backport of 3d0c3a0482496fc1914a40ec3c3eb70e67f0d643 from master
 2014-12-27 19:51:38 -05:00
Helen Sherwood-Taylor
2d0ae995d6 [1.6.x] Fixed #24041 -- Documented effect of changing a model instance's primary key. 
Backport of 4ccdf6e57f49d7e981dcd88c1db65229b8b92487 from master
 2014-12-24 15:07:32 -05:00
Frankie Robertson
70c965ad4f [1.6.x] Fixed #24035 -- Clarified docs on CACHE_MIDDLEWARE_KEY_PREFIX vs KEY_PREFIX 
Backport of 446b50b90e9e60760618b236d8b0ea75a3b19d5a from master
 2014-12-23 14:40:40 -05:00
David Cramer
d237aaa929 [1.6.x] Corrected scoping of savepoint example 
Backport of 27f68f8659a648cc9ed3e71f690959ed8a130c5a from master
 2014-12-22 07:51:19 -05:00
Tim Graham
89f9bf61bb [1.6.x] Updated advice on six.moves.range/xrange; refs #23812. 
Backport of bc88ec550afd5ce972b8c902572c6447d89c0cc9 from master
 2014-12-13 13:42:51 -05:00
Yohan Boniface
ec861bca69 [1.6.x] Fixed incorrect filter name in docs/topics/i18n/translation.txt. 
Backport of 38fc463fbfb9b74c38f1e8c33e4c99bc2274a880 from master
 2014-12-11 12:12:36 -05:00
wrwrwr
62048bcd62 [1.6.x] Cleaned up a note in docs/topics/db/sql.txt. 
Backport of 34a06d99e0fc96a0f0648bfde141d342e963e971 from master
 2014-12-06 09:26:20 -05:00
Young Yang
fdbe038ced [1.6.x] Fixed #23955 -- Corrected formset fields in topic guide. 
Backport of f0c7a6f36005d489e049236922abe0bd3a3eac2c from master
 2014-12-05 11:33:20 -05:00
Tim Graham
7e47c3e6af [1.6.x] Fixed typo in aggregation docs. 2014-12-03 20:11:24 -05:00
Benjamin Bach
a87ade7e30 [1.6.x] Documented a current limitation of multiple table annotation; refs #10060. 
Backport of 4b23a6c7a9232cc07ec95fe98be17efbd4449822 from master
 2014-12-03 19:19:41 -05:00
Danilo Bargen
276332d85c [1.6.x] Fixed #23543 -- Added docs on testing management command output. 
Backport of cdee8659763ee7044c1507bcd2202581b1744f0b from master
 2014-11-24 10:29:24 -05:00
Kevin Ndung'u
db227d9d20 [1.6.x] Fixed #23900 -- Added missing imports in code example. 
The Preventing header injection example included
classes that are not imported.

Thanks to Collin Anderson and Berker Peksağ for the
reviews.

Backport of 0d74209ef66111f29f122d5f5fdf8e2964890cc5 from master.
 2014-11-23 23:08:41 +01:00
Erik Romijn
7323e15d87 [1.6.x] Fixed #23793 -- Clarified password reset behavior in auth docs 
Backport of c5132382f081bd1b5a3618bbf23fa0cf720af14b from master.
 2014-11-15 17:46:41 +01:00
Tim Graham
f31e9c7a9d [1.6.x] Removed thread customizations of six which are now built-in. 
Backport of 7ef81b5cdd4c8eda12aa7786484a0bfde00aaaa4 from master
 2014-11-13 11:34:59 +01:00
Tim Graham
672015407b [1.6.x] Fixed #23744 -- Fixed typo in selenium testing example. 
Thanks djbug for the report.

Backport of 6d0547c1ad from master
 2014-11-01 12:37:29 -04:00
Tim Graham
78af6f134b [1.6.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:38:00 -04:00
Tim Graham
4a30e0aeb9 [1.6.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:37 -04:00
Tim Graham
2365c7c230 [1.6.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:47 -04:00
Ilya Baryshev
0f14263c90 [1.6.x] Fixed documentation of make_password kwargs. 
Backport of ed7c4df1ee from master
 2014-10-27 06:43:35 -04:00
Tim Graham
a57f32411f [1.6.x] Fixed some intersphinx references. 
Backport of babbf18999 from master
 2014-10-16 20:10:59 -04:00
Ian Lee
5e4ddcc52d [1.6.x] Fixed pep8 in docs/topics/logging.txt 
Backport of 947af46db3 from master
 2014-10-15 18:56:09 -04:00
Ismail Badawi
0aad1f1ea9 [1.6.x] Fixed #23597 -- Clarified the manager that {Single,Multiple}ObjectMixin.model uses. 
Backport of e501d4c505 from master
 2014-10-06 08:24:10 -04:00
Duane Hilton
8c0851051d [1.6.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:39 -04:00
Thomas Grainger
9beca95eb0 [1.6.x] Added SuspiciousOperation to list of caught exceptions in testing docs. 
Backport of 21683011d5 from master
 2014-09-24 13:05:09 -04:00
Ola Sitarska
a6c294a5a2 [1.6.x] Fixed #23529 -- Replaced comments tag library with humanize in docs 
Backport of ee442e97da390b7136dc12b66ddfa70263a60b5c from master.
 2014-09-21 17:34:23 +02:00
Gabe Jackson
31b5e3e010 [1.6.x] Added link to LogRecord attributes in logging.txt 
Backport of c5b4145fca from master
 2014-09-11 15:42:48 -04:00
Tim Graham
eba54eb157 [1.6.x] Fixed typo in topics/forms/formsets.txt 
Backport of e265112cd1 from master
 2014-09-10 11:17:57 -04:00
Iain Dawson
e2d4677a1c [1.6.x] Fixed an instance of 'an' before a word beginning with a consonant. 
Backport of ef8ef2a42d from master
 2014-09-10 07:17:37 -04:00
Octowl
731654197c [1.6.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:48 -04:00
oromero
414e3fc59d [1.6.x] Fixed #22161 -- Documented send() with no recipients won't raise an exception. 
Backport of 0f0a5c07f9 from master
 2014-09-05 20:40:52 -04:00
Corey Farwell
289d38b731 [1.6.x] Fixed typo in docs/topics/db/transactions.txt. 
Backport of 4db75925be from master
 2014-09-03 11:49:37 -04:00
Mitch Davis
fa76275e8a [1.6.x] Clarified that makemessages -l takes a locale name, not a language code. 
Backport of 5473c36cef from master
 2014-08-26 08:11:59 -04:00
Tim Graham
9bc1091980 [1.6.x] Fixed #22154 -- Added "Built-in" to some class-based views titles. 
Backport of 0c9f40f776 from master
 2014-08-23 19:31:09 -04:00
Kristian Glass
d3c75da7fb [1.6.x] Fixed #23342 -- Clarified warning about naive time objects. 
Thanks to apollo13 for suggested wording.

Backport of b7336ec179 from master
 2014-08-22 11:40:07 -04:00
Tim Graham
18f25efc9e [1.6.x] Fixed #23314 -- Tempered recommendation of storing profile data on custom user. 
Thanks gavinwahl for the report.

Backport of 3569536491 from master
 2014-08-19 07:27:03 -04:00
Tim Graham
d1e4fb996b [1.6.x] Fixed #23282 -- Corrected inheritance and reverse relations example. 
Thanks knowledgepoint-devs for the report and claudep for review.

Backport of 7006187064 from master
 2014-08-19 06:30:01 -04:00
Ola Sitarska
ffb9cbfdaa [1.6.x] Fixed #23267 -- Fixed typo in Translation documentation 
Thanks to Tomin1 for the report.

Backport of 2e7be92b4df29ac851d570e57da5dcf756c5ac52 from master.
 2014-08-11 12:09:32 +02:00
Mohammed Attia
3d8e106ae9 [1.6.x] Removed a doc reference to the deprecated mimetype kwarg. 
Backport of 61ed959235 from master
 2014-08-06 22:20:05 -04:00
Erik Romijn
316178efe6 [1.6.x] Fixed #23149 -- Clarified note on HTTPOnly in cookie-based session docs 
Backport of e26366da44bb343e7a95d01ff0dd18b8026c2802 from master.
 2014-08-02 18:59:27 +02:00
Tim Graham
0dfc37669d [1.6.x] Updated MySQL links to version 5.6. 
Backport of fb4f3e04b1 from master
 2014-08-02 10:27:34 -04:00
Tim Graham
1cfb1052ee [1.6.x] Fixed typo in docs/topics/testing/tools.txt. 
Backport of 7ce4ef58c9 from master
 2014-08-01 09:43:52 -04:00
Tim Graham
faff723770 [1.6.x] Updated timezone docs to use timezone.now() 
Thanks James Cleveland for the report and Aymeric for suggesting
the solution.

Backport of da59902250 from master
 2014-07-31 12:57:53 -04:00
Tim Graham
8567c1a3c2 [1.6.x] Fixed #23132 -- Removed confusing clause in auth docs. 
Backport of abb97cffdf from master
 2014-07-30 08:16:07 -04:00
Moayad Mardini
6c70b1d7df [1.6.x] Fixed #22491 -- documented how select_for_update() should be tested. 
Thanks Andreas Pelme for the report.

Backport of 668d432d0a from master
 2014-07-28 10:58:34 -04:00
David Hoffman
2630cafc86 [1.6.x] Fixed #23097 -- Switched to new octal format in docs 
Backport of e1c85167a3 from master.
 2014-07-26 11:24:04 +02:00
Moayad Mardini
ae5a4668be [1.6.x] Fixed #22827 -- clarified what each cache middleware does. 
Thanks Keryn Knight for the report.

Backport of f9b7a0383c from master
 2014-07-25 06:26:45 -04:00
Iain Dawson
205090bc71 [1.6.x] Replaced instances of 'his/her' with 'their'. 
Backport of 8fbf13a6c8 from master
 2014-07-21 19:55:28 +00:00
Tim Graham
21853c1b90 [1.6.x] Fixed #23023 -- Added warning against local-memory cache. 
Thanks django at kerz.id.au.

Backport of 7d0519c725 from master
 2014-07-16 12:35:04 -04:00