0
0
mirror of https://github.com/django/django.git synced 2024-11-29 14:46:18 +01:00
Commit Graph

16662 Commits

Author SHA1 Message Date
pegler
38e24d680d Fixed #21554 -- Incorrect SQL generated when using multiple inheritance. 2013-12-06 14:12:38 -05:00
Tim Graham
b63acdfe71 Removed a u'' prefix that prevented the docs from building on Python 3.2. 2013-12-06 13:06:59 -05:00
Ramiro Morales
362dd68fb2 Added new 'srtext' spatialite 4.x SpatialRefSys column to its model.
This is for general consistency in the GeoDjango DB backends.
Thanks Claude for the fix.

Refs #19678.
2013-12-06 12:35:18 -03:00
Baptiste Mispelon
621c25c419 Added missing deconstruct() methods. 2013-12-06 15:23:34 +01:00
Baptiste Mispelon
72479a2957 Made the migration detector use meta.local_fields instead of meta.fields.
Refs #21010.

Thanks to Loïc for the patch.
2013-12-06 15:23:21 +01:00
Baptiste Mispelon
19e4374971 Fixed ModelState breaking when unique_together has unhashable elements. 2013-12-06 15:22:52 +01:00
Baptiste Mispelon
54d9e3ccf6 Fixed error in ManyToManyField.deconstruct(). 2013-12-06 15:22:52 +01:00
Baptiste Mispelon
f463789f62 Added app_label to the error message when field reconstructing fails. 2013-12-06 15:22:47 +01:00
Andrew Godwin
a06fd092ef Merge pull request #2037 from bmispelon/invalidbaseserror
Fixed TypeError when rendering ModelState with multiple bases.
2013-12-06 05:48:21 -08:00
Ramiro Morales
9a73e7f40c Fixed #19678 -- GeoDjango test failure with spatialite >= 3.0.
Thanks Julien for the report and Claude for the fix.
2013-12-06 08:51:45 -03:00
Claude Paroz
482ca0cecc Renamed syncdb to migrate in spatialite backend 2013-12-06 10:00:09 +01:00
maurycyp
4d0c72eb68 Removed unreachable else in try block. 2013-12-06 01:10:52 -05:00
Alasdair Nicol
317fd13c7a Fixed #21562 -- Warned against using the same app name as a django contrib app.
Thanks yourcelf for the report.
2013-12-05 19:09:45 -05:00
Baptiste Mispelon
aba75b0d71 Fixed TypeError when rendering ModelState with multiple bases. 2013-12-06 00:55:31 +01:00
Baptiste Mispelon
38662d11c4 Fixed another typo in custom model field documentation. 2013-12-05 23:11:30 +01:00
Baptiste Mispelon
3396d5716b Fixed typo in custom model field documentation. 2013-12-05 23:07:50 +01:00
Ramiro Morales
e36c165b14 Corrected setting name in gis test error message. 2013-12-05 18:22:37 -03:00
Andrew Godwin
e9c6d04224 Better error reporting when from_app_cache fails 2013-12-05 14:20:30 +00:00
Andrew Godwin
4ca39684ee Fix poor variable name (flake8 warning) 2013-12-05 14:11:46 +00:00
Alex Gaynor
cbf8e8aa12 Fixed a flake8 error 2013-12-05 08:08:34 -06:00
Tim Graham
8209906a0e Merge pull request #2030 from frankwiles/master
Fixed manager documentation inaccuracy
2013-12-05 04:17:11 -08:00
maurycyp
ae734b75c1 Removed 'return' in __init__ 2013-12-05 07:09:36 -05:00
Frank Wiles
164df40501 Fixing manager documentation inaccuracy 2013-12-04 18:03:28 -06:00
Tim Graham
1864c6b5ad Merge pull request #2029 from alasdairnicol/releases_ordering
List ed 1.6.x releases in descending order
2013-12-04 14:20:59 -08:00
Alasdair Nicol
0daa2f1bf1 List 1.6.x releases in descending order 2013-12-04 21:32:41 +00:00
Andrew Godwin
3b8e46cbc7 Migration VCS conflict detection and --merge for makemigrations 2013-12-04 16:01:49 +00:00
Aymeric Augustin
cd9e85ece9 Fixed #21558 -- Support building CHM files.
Thanks Michał Pasternak.
2013-12-04 16:46:56 +01:00
Andrew Godwin
ce05b8a69e Don't make a second migration if there was a force-null-default addcol. 2013-12-04 13:56:22 +00:00
Andrew Godwin
df800b1609 Add clone() method to Field to get clean copies of it. 2013-12-04 13:55:45 +00:00
Andrew Godwin
ab587fa51a Add --dry-run option to makemigrations 2013-12-04 13:55:20 +00:00
Andrew Godwin
1d20e6df95 Migrate prompts if you need makemigrations, runserver prompts for migrate 2013-12-04 13:34:01 +00:00
Ramiro Morales
abb04f1f3f Added link to localized formatting doc from main index. 2013-12-04 10:26:03 -03:00
Bouke Haarsma
91c38ce4b2 Fixed 21406 -- Made blocktrans 'trimmed' option preserve line numbers.
Thanks Bouke Haarsma for report, fix and initial patch.
2013-12-04 08:36:20 -03:00
Aymeric Augustin
4d738fcc3b Fixed #21546 -- Strengthened kqueue detection.
Thanks Loic Bistuer.
2013-12-04 10:11:42 +01:00
Ramiro Morales
12615dab78 Fixed #13476 -- Added support for color in console output under Windows.
Detect and use the services of the ANSICON third-party tool if it's
available.
2013-12-02 23:18:04 -03:00
Alasdair Nicol
c75dd664cf Fixed #21538 -- Added numpy to test/requirements/base.txt
Thanks Tim Graham for the report
2013-12-02 13:37:59 -05:00
Aymeric Augustin
643180b5d2 Merge pull request #2016 from loic/ticket21545
Fixed #21545 -- autoreload kqueue events weren't cleared which caused an infinite loop.
2013-12-02 09:45:14 -08:00
Loic Bistuer
9ccde8cfaf Fixed #21545 -- autoreload kqueue events weren't cleared which caused an infinite loop. 2013-12-03 00:12:04 +07:00
Krzysztof Jurewicz
b8be3055f1 Fixed #21543 -- Removed base_dir attribute in StaticFilesHandler.
This code seems to be an artifact of AdminMediaHandler removed in [5c53e30607].
2013-12-01 18:03:59 -05:00
Tim Graham
3b60ffa334 Fixed incorrect type for max_length. 2013-12-01 14:21:57 -05:00
Tim Graham
fddb0131d3 Fixed #21535 -- Fixed password hash iteration upgrade.
Thanks jared_mess for the report.
2013-11-30 14:18:37 -05:00
Unai Zalakain
2688462f91 Refs #21230 -- removed direct settings manipulation from template tests 2013-11-30 13:47:16 -05:00
Claude Paroz
2080bce695 Fixed #21358 -- Allowed runserver on non-English locales
Thanks svartalf for the report.
2013-11-30 19:17:36 +01:00
Tim Graham
f3e7ab366c Removed gender-based pronouns per [c0a2daad78]. 2013-11-30 08:37:15 -05:00
Alex Gaynor
c0a2daad78 Documented the house style for gender neutral pronouns. 2013-11-30 08:31:58 -05:00
Alex Hill
ec73ce5d8a Fixed comment typos. 2013-11-30 07:59:32 -05:00
Claude Paroz
6310d658b7 Closed file after reading pot file
Faulty line was introduced in 50a8ab7cd1.
2013-11-30 11:31:17 +01:00
Claude Paroz
50a8ab7cd1 Enabled makemessages to support several translation directories
Thanks Rémy Hubscher, Ramiro Morales, Unai Zalakain and
Tim Graham for the reviews.
Also fixes #16084.
2013-11-30 11:00:23 +01:00
Alex Gaynor
9af7e18f35 Fixed an unescisarily gendered pronoun in a docstring 2013-11-29 16:57:36 -06:00
Loic Bistuer
b72b85af15 Removed Form._errors from the docs in favor of the add_error API. 2013-11-30 01:00:53 +07:00