mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-29 22:56:46 +01:00
Code Issues Releases Wiki Activity
17,600 Commits 28 Branches 423 Tags 716 MiB
54d5c37de6
Commit Graph

17600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Romijn
54d5c37de6 Fixed #22471 -- Corrected misprint in i18n docs 
Thanks to aruseni for the report.
 2014-04-18 15:05:18 +02:00
Tim Graham
dc7bc42cce Added missing versionadded annotation and tweaked release note; refs #22465. 2014-04-18 07:18:15 -04:00
amatellanes
8394e570ba Fixed #22465 -- New assertion assertJSONNotEqual 2014-04-18 15:11:08 +07:00
Simon Charette
9bc377d7d0 Fixed a test failure introduced by 214d1e1b0f. 2014-04-18 02:30:40 -04:00
Alex Gaynor
f293063c20 Merge pull request #2586 from mmardini/patch-2 
Fixed #22464 - included contrib/gis/static in tarball
 2014-04-17 23:04:52 -07:00
Moayad Mardini
bad4721b45 Fixed #22464 - included contrib/gis/static in tarball 
After switching to setuptools in commit 66f546b,
contrib/gis/static isn't included in tarball anymore, this commit adds
that path to be `recursive-include` in `MANIFEST.in`
 2014-04-18 08:00:41 +02:00
Simon Charette
0d397e5a5b Revert "Fixed #22397 -- Issues removing M2M field with explicit through model." 
This reverts commit 00e3b9a2a9.

It's causing a regression when tested with the proxy_model_inheritance tests.
 2014-04-18 01:27:30 -04:00
Moayad Mardini
214d1e1b0f Fixed #22454 - Changed compatibility warning hint 
The warning hint of `_check_test_runner` of 1.6 compatibility had a link
to a general release note. The link should be edited to refer the
relevant "Backwards incompatible changes in 1.6" section that documents
the cause and the possible solutions and workarounds of the warning.
 2014-04-17 20:41:25 -04:00
Tim Graham
a4acb80463 Fixed #22444 -- Marked initial SQL/fixture loading as deprecated. 
Thanks Karen Tracey for the report.
 2014-04-17 20:36:52 -04:00
Tim Graham
11e30b684d Fixed a KeyError on login with legacy sessions; refs #21649. 
Thanks Loic for the report.
 2014-04-17 19:57:20 -04:00
Donald Stufft
ecff136f69 Merge pull request #2582 from alex/stdlib-pbkdf2hmac 
Use the stdlib's PBKDF2 implementation when available.
 2014-04-17 16:01:17 -04:00
Donald Stufft
438e6fe63d Merge pull request #2583 from alex/extras-bcrypt 
Include an 'extra_requires' for bcrypt
 2014-04-17 15:59:37 -04:00
Claude Paroz
3cea917e3e Confirmed support for PostGIS 2.1 and GDAL 1.10 
Refs #22456.
 2014-04-17 21:23:14 +02:00
Claude Paroz
c082f3c74c Fixed #22456 -- Replaced 900913 EPSG code by 3857 in some tests 
3857 is now the official EPSG code for the Google spherical mercator
projection and some recent versions of GDAL do not recognize 900913
any longer.
Thanks Tim Graham for the report and initial patch.
 2014-04-17 21:18:07 +02:00
Alex Gaynor
0e27882b3a Stray paren 2014-04-17 11:29:07 -07:00
Alex Gaynor
464b98b1fe Include an 'extra_requires' for bcrypt 2014-04-17 11:28:09 -07:00
Alex Gaynor
7283c21173 For another day 2014-04-17 11:07:19 -07:00
Alex Gaynor
21a1fddcc4 Typo fix 2014-04-17 11:04:57 -07:00
Alex Gaynor
cb68eb3e6d Use the stdlib's PBKDF2 implementation when available. 
This is a bit faster than ours, which is good, because it lets you increase
the iteration counts.

This will be used on Python 3.4+, and, pending the acceptance of PEP466, on
newer Python 2.7s.
 2014-04-17 11:02:42 -07:00
Andrew Gorcester
00e3b9a2a9 Fixed #22397 -- Issues removing M2M field with explicit through model. 
Changed the migration autodetector to remove models last so that FK
and M2M fields will not be left as dangling references. Added a check
in the migration state renderer to error out in the presence of
dangling references instead of leaving them as strings. Fixed a bug
in the sqlite backend to handle the deletion of M2M fields with
"through" models properly (i.e., do nothing successfully).

Thanks to melinath for report, loic for tests and andrewgodwin and
charettes for assistance with architecture.
 2014-04-17 12:54:35 -04:00
Tim Graham
47927eb786 Revert "Fixed #22401 -- Deprecated regular expression parsing of initial SQL in favor of installing sqlparse." 
This reverts commit 071c933775.

This introduced a regression on MySQL and custom SQL is deprecated.
 2014-04-16 21:03:22 -04:00
chriscauley
66ec9ee441 Fixed #22378 -- Updated \d to [0-9]+ in urlpatterns of docs and tests. 
Thanks tomwys for the suggestion.
 2014-04-16 20:36:29 -04:00
Ben Davis
030dd4f72c Fixed #22220 -- Added more examples to reverse() documention. 
Thanks EvilDMP for the suggestions.
 2014-04-16 20:29:17 -04:00
Justin Hamade
a13df671a5 Fixed #22434 -- Retain ordering on related sliced subqueries. 
Thanks maciej.pawlisz for the report, and charettes for the review.
 2014-04-16 17:57:11 -04:00
Mariano Rezk
7cd74fc96e Fixed #22455 -- Documented return values for send_mail and send_mass_mail 2014-04-16 17:35:17 -04:00
Simon Charette
79f05616fb Fixed flake8 warnings introduced in recent commits. 2014-04-16 16:49:37 -04:00
Motiejus Jakštys
0e45669fa9 Fixed #22460 -- Explicity remove constraints when dropping a related field. 2014-04-16 15:38:31 -04:00
Tim Graham
b5ce21accb Fixed spelling errors in documentation. 2014-04-16 09:39:00 -04:00
Jordi Yeh
2810299117 Fixed #22457 -- Fixed contributing guide w/o github set-up 
The published commnand was not working when the user did not have
the git client set-up with the public-key. Changed the contributing
guide to clone it from https instead.
 2014-04-16 09:33:53 -04:00
Tim Graham
eefad142de Fixed #22453 -- Corrected DoesNotExist message in docs. 
Thanks Eugenio Cano-Manuel.
 2014-04-16 08:36:02 -04:00
Tim Graham
ae5b662796 Added a note regarding django.contrib.auth.authenticate. 
Thanks Josh Brown for the suggestion.
 2014-04-16 07:47:56 -04:00
Tim Graham
465980d070 Added RemoteUserMiddleware to middleware reference page. 2014-04-16 07:22:15 -04:00
Mariano Rezk
4e3d8ae610 Fixed #22443 -- Document smtp.EmailBackend.timeout default value 
Django 1.7 introduces a new timeout parameter for the SMTP email backend:
http://docs.djangoproject.com/en/dev/topics/email/#django.core.mail.backends.smtp.EmailBackend.timeout

However, there was no mention of the default value for this parameter.
 2014-04-15 17:47:51 -04:00
Tim Graham
0f37d2e4c0 Fixed #22392 -- Corrected deployment instructions for Apache 2.4. 
Thanks zjcheah at yahoo.com for the report.
 2014-04-15 17:44:37 -04:00
Julien Phalip
401be8a206 Merge pull request #2553 from liavkoren-vmfarms/ticket_18586 
Ticket 18586
 2014-04-14 18:23:01 -04:00
Liav Koren
9b29a551e4 Refs #18586 - Refactored model get_or_create test. 
Refactored get_or_create test into several smaller test functions across two
different test classes. Also converted the comments over to docstrings.
 2014-04-14 18:19:37 -04:00
Marc Egli
0bcc92c691 Fixed #22356 -- Added a check to make sure unique_together fields are local. 2014-04-14 16:49:40 -04:00
Jacob R. Rothenbuhler
17c1884456 Fixed #22369 -- Added count parameter to assertTemplateUsed 2014-04-14 15:55:10 -04:00
Andrew Godwin
09af48c70f Improve migrations/schema docs 2014-04-14 13:07:02 -04:00
Simon Charette
63d0cbab04 Merge pull request #2541 from arachnegl/22398_KEY_FUNCTION_doc_detail 
Fixed #22398 -- Added detail about callable in KEY_FUNCTION docs
 2014-04-13 19:12:15 -04:00
arachnegl
8da86fd19b Fixed #22398 -- Added detail about callable in KEY_FUNCTION docs 2014-04-13 18:52:43 -04:00
Simon Charette
72d3889db4 Fixed #22350 -- Consistently serialize bytes and text in migrations. 
Thanks to @treyhunner and Loïc for their suggestions and review.
 2014-04-13 18:22:26 -04:00
Loic Bistuer
b82f30785f Fixed stray comment introduced by d3b71b9. 
Thanks Claude Paroz for the report.
 2014-04-13 08:26:25 +07:00
valtron
d3b71b976d Fixed #21760 -- prefetch_related used an inefficient query for reverse FK. 
Regression introduced by commit 9777442. Refs #21410.
 2014-04-13 00:34:16 +07:00
Claude Paroz
3417ba0309 Also allowed a non-overridden setting to be deleted 
Refs #20032, #18824. Thanks ztorstri at gmail.com for the report.
 2014-04-12 15:33:22 +02:00
Claude Paroz
3e3a7372f5 Fixed #22102 -- Made SimpleTestCase tests run before unittest.TestCase ones 
Thanks aptiko for the reporti and Tim Graham for the review.
 2014-04-12 11:42:06 +02:00
Aymeric Augustin
476db08b16 Improved a comment. Thanks intgr for the report. 2014-04-11 23:01:00 +02:00
Tim Graham
c487b1e230 Fixed #22419 -- Typo in docs/topics/db/multi-db.txt. 
Thanks Josh Kupershmidt.
 2014-04-10 19:33:00 -04:00
Aymeric Augustin
ee837b9a22 Increased robustness of 58161e4e. Refs #22291. 2014-04-10 21:22:47 +02:00
Aymeric Augustin
8176150850 Fixed #21202 -- Maintained atomicity when the server disconnects. 
Thanks intgr for the report.

This commit doesn't include a test because I don't know how to emulate a
database disconnection in a cross-database compatible way.

Also simplified a 'backends' test that was constrained by this problem.
 2014-04-10 21:22:47 +02:00