p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,974 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

13974 Commits

Author SHA1 Message Date
Baptiste Mispelon f89cddae66 Fixed missing imports from 16e5fdd9cb. 2013-11-19 10:50:20 +01:00
Tim Graham 1135525eac [1.5.x] Fixed typo in topics/http/sessions.txt. 
Backport of 9348fc5628 from master
 2013-11-18 19:11:37 -05:00
Tim Graham 402967f49c [1.5.x] Fixed #21240 -- Added 1.5 release note for OneToOneField/select_related change. 
Thanks marcin at sokrates.pl.

Backport of ba63b9895b from master
 2013-11-18 09:35:21 -05:00
Tim Graham b41540f156 [1.5.x] Fixed #21440 -- Typo #2 in topics/http/shortcuts.txt 
Thanks alasdair.

Backport of d011714002 from master
 2013-11-15 10:22:55 -05:00
Tim Graham 47b6a7c354 [1.5.x] Fixed #21440 -- Typo in topics/http/shortcuts.txt 
Thanks olof.bjarnason at gmail.com for the report.

Backport of 6e9e6ca071 from master
 2013-11-15 07:11:12 -05:00
Matt Robenolt 16e5fdd9cb [1.5.x] Propagate get_user_model exception from get_user 
Fixes #21439

Backport of 3560ef04 from master.

Conflicts:
	django/contrib/auth/tests/auth_backends.py
 2013-11-14 21:19:03 +01:00
Baptiste Mispelon 8d1f339667 [1.5.x] Removed a mention of `Form._errors` from the documentation. 
Also removed a sentence that was incorrect: raising a
`ValidationError` inside `Form.clean` doesn't clear the
`cleaned_data` attribute.

Thanks to loic84 and timograham for the review.

Backport of 9aa6d4bdb6 and
0048ed77c7 from master.
 2013-11-12 21:05:06 +01:00
Bernardo Pires 12ff1623d6 [1.5.x] Fixed #21372 -- Corrected docs regarding translating LANGUAGES. 
Corrected LANGUAGES documentation on how to translate language
names. Now using django.utils.translation.ugettext_lazy instead
of a dummy gettext() function.

Thanks to Salvatore for the report.

Backport of 8bc350b385 from master.

Conflicts:
	docs/topics/i18n/translation.txt
 2013-11-10 00:09:02 +01:00
glts 1669a438a9 [1.5.x] Added missing parameter in npgettext_lazy docs 
Backport of 413307fe35 from master
 2013-11-08 18:35:52 -05:00
Tim Graham 88639d3f7b [1.5.x] Fixed broken link for TestCase.multi_db. 2013-11-07 09:49:19 -05:00
Tim Graham 2d09f368f3 [1.5.x] Added 1.4.10 release notes. 
Backport of c29dd76f40 from master
 2013-11-07 09:42:52 -05:00
Sylvain Bellemare 376ba1c5b3 [1.5.x] Removed no longer relevant word 
Backport of 3935b0f263 from master
 2013-11-07 09:33:10 -05:00
Tim Graham 2e881f15b8 [1.5.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:10 -04:00
Sylvain Bellemare 9d23c3d03d [1.5.x] Fixed typo -- "a" user, not "an" user 
Backport of c7dabe49dd from master
 2013-11-01 19:29:15 -04:00
Claude Paroz 60ec8ae4b2 [1.5.x] Fixed #21364 -- Specified InnoDB full-text support from MySQL 5.6.4 on 
Thanks thevlad at gmail.com for the report.
Backport of 89116cf24a from master.
 2013-11-01 11:02:48 +01:00
Claude Paroz dd0c204828 [1.5.x] Fixed #21359 -- Corrected MySQL collation name in databases docs 
Thanks k_sze for the report.
Backport of 67c6c1a7c from master.
 2013-11-01 10:47:29 +01:00
Tim Graham 3ec994de2a [1.5.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:39 -04:00
Antoine Catton e21d935f52 [1.5.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:23 -04:00
Tim Graham f832f0d2c3 [1.5.x] Fixed #21316 -- Documented that modifying safe strings makes them unsafe. 
Thanks dev@simon.net.nz for the suggestion and vijay_shanker for the patch.

Backport of 1edef50880 from master
 2013-10-30 08:12:19 -04:00
Tim Graham 9074d2f5f9 [1.5.x] Fixed #21337 -- Documented removal of django.core.servers.basehttp.WSGIServerException 
refs 2ca00faa91

Backport of b47a052eb5 from master
 2013-10-30 07:48:16 -04:00
Claude Paroz 3b4b376bd1 Revert "[1.5.x] Fixed #21335 -- Use importlib from python3 when using python3" 
This reverts commit 1ef737416a.
This would require changing some import_module calls (relative
syntax, see ec0a3f5085), too much for a stable release.
 2013-10-26 23:36:16 +02:00
Andrey Antukh 1ef737416a [1.5.x] Fixed #21335 -- Use importlib from python3 when using python3 
Backport of 3351e94ffa from master.
 2013-10-26 22:57:56 +02:00
Tim Graham 4b4b795bd5 [1.5.x] Fixed #21325 -- Added missing argument to permission_required decorator. 
Backport of cc2049cdd7 from master
 2013-10-25 17:37:46 -04:00
Paolo Melchiorre cd59b6f2f3 [1.5.x] Fixed typo in docs/releases/1.4.9.txt. 
Backport of 3b0293370a from master
 2013-10-25 07:55:45 -04:00
Tim Graham 7aebbc1632 [1.5.x] Bump version post-release. 2013-10-25 07:53:39 -04:00
James Bennett c30516e9cc [1.5.x] Bump everything for 1.5.5 bugfix release. 2013-10-24 23:31:51 -05:00
Tim Graham f571345ef7 [1.5.x] Bumped release date for 1.5.5 & 1.4.9. 
Backport of 4ce5c119b5 from master
 2013-10-23 18:29:16 -04:00
Shai Berger cc0dcfc644 Fixed #13245: Explained Oracle's behavior w.r.t db_table 
and how to prevent table-name truncation

Thanks russellm & timo for discussion, and timo for review.

Backported from master 317040a73b
 2013-10-23 15:04:14 +03:00
Tim Graham 6e41392838 [1.5.x] Added 1.5.5 and 1.4.9 release notes 
Backport of 2eb8f15516 from master
 2013-10-22 20:24:30 -04:00
Tim Graham 26d1496f90 [1.5.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:20 -04:00
Tim Graham ed67184b30 Oracle defer test failure; refs #16436. 
Oracle doesn't like grouping by TextField, so use CharFields instead in
models.

Backport of 728d3fe1ba from master
 2013-10-21 18:56:25 -04:00
Florian Apolloner 166be6a77e [1.5.x] Fixed #21253 -- PBKDF2 with cached HMAC key 
This gives a 2x speed increase compared to the existing implementation.

Thanks to Steve Thomas for the initial patch and Tim Graham for finishing it.

Backport of 1e4f53a6eb from master.
 2013-10-21 20:01:39 +02:00
Riccardo Magliocchetti 045d192222 [1.5.x] Fixed #21296 -- Added docs for PostgreSQL and unix domains sockets. 
Backport of 1e39982b6e from master
 2013-10-21 13:10:51 -04:00
Juergen Schackmann 8ffa99ccb6 [1.5.x] Fixed #21212 -- Documented the reverse name for OneToOneField. 
Thanks bjb at credil.org for the report.

Backport of f8632572ad from master
 2013-10-18 16:22:47 -04:00
Tim Graham 472917024b [1.5.x] Added a warning regarding session security and subdomains. 
Backport of a3372f67cb from master
 2013-10-18 09:44:34 -04:00
Tim Graham 0fb2897c81 [1.5.x] Fixed bug causing CSRF token not to rotate on login. 
Thanks Gavin McQuillan for the report.

Backport of ac4fec5ca2 from master
 2013-10-18 08:33:07 -04:00
Tianyi Wang 312ca5e9cb [1.5.x] Improvement on InlineFormSet doc, refs #21006 
Backport of 944a2bb7c1 from master
 2013-10-15 09:58:57 -04:00
Tianyi Wang 1acd5fc9d2 [1.5.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:37:51 -04:00
Sorcha Bowler 6e7de2edb0 [1.5.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:48 -04:00
Bouke Haarsma 7f62d794b3 [1.5.x] Fixed #20962 -- Documented that template tag render() may raise exceptions. 
Thanks Keryn Knight for the report.

Backport of e077224f4a from master
 2013-10-14 11:55:15 -04:00
Bouke Haarsma 5c1be8a870 [1.5.x] Fixed #21210 -- Documented when runserver doesn't auto-restart. 
Thanks gergely at polonkai.eu for the suggestion.

Backport of 9b7d38ed5a from master
 2013-10-14 10:38:34 -04:00
Bouke Haarsma b268488806 [1.5.x] Fixed #21264 -- Incorrect RST usage in docs 
Backport of 8fc63087f6 from master
 2013-10-14 08:17:00 -04:00
Max Vizard e532d1e38f [1.5.x] Fixed #21027 -- Updated tutorial 5 docs to link to management shell command page. 
Backport of 13ddf0e002 from master
 2013-10-14 08:10:55 -04:00
Aymeric Augustin ef9133768c [1.5.x] Fixed #21256 -- Error in datetime_safe.datetime.combine. 
Backport of d9b6fb8 from master
 2013-10-13 19:11:53 +02:00
Aymeric Augustin 2fb127b881 Fixed #21261 -- Added missing import in RedirectView docs 
Thanks yokomizor.
 2013-10-13 19:00:55 +02:00
Tim Graham 2b8519760e [1.5.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:55 -04:00
Cody Scott 766fbd53cb [1.5.x] Minor edits to docs/topics/db/queries.txt. 
Backport of 8bfc7cc64c from master
 2013-10-11 15:35:52 -04:00
Cody Scott 3e6d895912 [1.5.x] Small improvements to docs/topics/db/models.txt 
Backport of 695bc0d191 from master
 2013-10-10 20:57:20 -04:00
Anssi Kääriäinen 9f8a36eb20 [1.5.x] Fixed #21248 -- Skipped test_bcrypt if no py-bcrypt found 
Pre 1.6 Django worked only with py-bcrypt, not with bcrypt. Skipped
test_bcrypt when using bcrypt to avoid false positives.
 2013-10-09 14:40:32 +03:00
Tai Lee b495c24375 [1.5.x] Fixed #16436 -- defer + annotate + select_related crash 
Correctly calculate the ``aggregate_start`` offset from loaded fields,
if any are deferred, instead of ``self.query.select`` which includes all
fields on the model.

Backpatch of 69f7db153d from master.
 2013-10-09 13:55:32 +03:00