mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Code Issues 25 Releases Wiki Activity
16,736 Commits 28 Branches 426 Tags 666 MiB
856aaaf2b1
Commit Graph

16736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claude Paroz
0873200e7f Merge pull request #2058 from c-schmitt/fixes_21560 
Fixed #21560 -- missing 'slug' field in example code
 2013-12-10 01:14:09 -08:00
Christian Schmitt
744aac6dac Fixed #21560 -- missing 'slug' field in example code 
I updated the documentation, that the modelform now includes the 'slug' field.
 2013-12-09 22:54:11 +01:00
Simon Charette
c047dda057 Removed an erroneous leading slash introduced by a626bdf648a. 2013-12-08 13:18:53 -05:00
Claude Paroz
626bdf648a Updated a bunch of hyperlinks in documentation 2013-12-08 18:40:09 +01:00
Ramiro Morales
f876552f4b (Re-)added GeoDjango instructions for building pysqlite2 correctly. 
This is a partial undo of 1b142ef5dd.
 2013-12-08 11:14:18 -03:00
Florian Apolloner
3f900a1e2c Merge pull request #2052 from loic/setup.cfg 
Made flake8 ignore the .git directory.
 2013-12-08 05:23:22 -08:00
Loic Bistuer
27dc7908d5 Made flake8 ignore the .git directory. 2013-12-08 20:16:45 +07:00
Florian Apolloner
c78bd9eff2 Merge pull request #2048 from loic/ValidationError.message_dict 
Trigger AttributeError in ValidationError.message_dict when error_dict is missing.
 2013-12-08 05:06:39 -08:00
Alex Gaynor
d653c0bd2e Merge pull request #2050 from maurycyp/master 
Renamed first argument of class method to cls
 2013-12-07 17:16:01 -08:00
maurycyp
e2e2482391 Renamed first argument of class method to cls 2013-12-07 20:13:53 -05:00
Claude Paroz
5c61b8519d Fixed #18531 -- Deprecated Geo Sitemaps 
I've chosen a quick deprecation path, as Geo Sitemaps themselves
are deprecated from some time now.
 2013-12-07 21:46:03 +01:00
Vajrasky Kok
a7cf48a2b7 Fixed #21573 -- Improved performance of utils.text.normalize_newlines. 2013-12-07 17:19:29 +01:00
Loic Bistuer
2e3c7d8820 Trigger AttributeError in ValidationError.message_dict when error_dict is missing. 
The goal of this change is twofold; firstly, matching the behavior of Django 1.6
and secondly, an AttributeError is more informative than an obscure ValueError
about mismatching sequence lengths.

Refs #20867.
 2013-12-07 23:01:28 +07:00
Claude Paroz
65faa84de3 Removed unneeded string normalization in contrib.admin 
With Python 2.7 and up, named parameter keys are not limited to
bytestrings any longer. This mainly reverts 3bd384aa62.
 2013-12-07 15:58:27 +01:00
Tim Graham
e7dcd40da2 Added extra newline for flake8. 2013-12-07 07:06:28 -05:00
Loic Bistuer
a8f4553aae Fixed #21555 -- Made ValidationError pickable. 
Thanks trac username zanuxzan for the report and original patch.
 2013-12-07 18:58:37 +07:00
Claude Paroz
41ebc4838d Fixed #21551 -- Reenabled loading fixtures from subdirectory 
This was a regression in Django 1.6 that was only partially
restored in 839940f27f.
Thanks Jonas Haag for the report.
 2013-12-07 10:47:34 +01:00
Claude Paroz
8a9c8bb907 Fixed #21568 -- Added missing ModelMultipleChoiceField to_python method 
Thanks dibrovsd at gmail.com for the report and Simon Charette
for the review.
 2013-12-07 10:14:22 +01:00
Claude Paroz
6d20a80d98 Merge pull request #2045 from vajrasky/ticket_21572 
Fixed #21572 -- Added unit test for django.utils.text.normalize_newlines...
 2013-12-07 01:07:23 -08:00
Vajrasky Kok
a1a26690b9 Fixed #21572 -- Added unit test for django.utils.text.normalize_newlines. 2013-12-07 16:28:22 +08:00
Baptiste Mispelon
19b22d4f0e Added fix for #21530 to 1.6.1 release notes. 2013-12-07 03:37:31 +01:00
Baptiste Mispelon
a020dd0a99 Fixed #21530 -- Prevent AttributeError in default URLconf detection code. 
Thanks to @dmyerscoug for the report and original patch
and to @alasdairnicol for the added tests.
 2013-12-07 03:21:58 +01:00
Alex Gaynor
ffc0e0ca37 Corrected a flake8 issue -- this line is imported for the purpose of re-exposing the name 2013-12-06 13:22:53 -06:00
Roger Hu
bbc73e6a12 Fixed #21566 -- Fixed AttributeError when using bulk_create with ForeignObject. 2013-12-06 20:20:16 +01:00
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