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

15729 Commits

Author SHA1 Message Date
Florian Apolloner 2326dedde8 Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type. 2013-09-06 19:24:18 +02:00
Andrew Godwin be983ee403 Also test failure case of ProjectState dependency resolution 2013-09-06 12:18:24 -05:00
Andrew Godwin cdeff3acc2 Project/ModelState now correctly serialize multi-model inheritance 2013-09-06 12:16:03 -05:00
Andrew Godwin 6f7977bb63 Fixed #21029: Test for previously-commited SchemaEditor.__exit__ bug. 2013-09-06 12:16:03 -05:00
Jacob Kaplan-Moss ffe21e1f40 Merge pull request #1560 from technivore/ticket_20970 
Related Fields documentation improvements
 2013-09-06 10:11:05 -07:00
Daniel Boeve b69d1eac64 Fixed #20975 -- Fixed identation in docs/internals/committers.txt 
Thanks EvilDMP for the report.
 2013-09-06 13:04:13 -04:00
Matthew Rich a5bcc09c8f documented RelatedManager calling save() behind the scenes, added section on direct replacement of related object set 2013-09-06 11:37:08 -05:00
Chris Wilson eade315da1 Fixed #10164 -- Made AutoField increase monotonically on SQLite 
Thanks malte for the report.
 2013-09-06 12:31:17 -04:00
Andrew Godwin 630eb0564a Fix SchemaEditor.__exit__ to handle exceptions correctly 2013-09-06 11:09:16 -05:00
Andrew Godwin 9f6e6009a4 Add --list option to migrate command 2013-09-06 11:06:19 -05:00
Adrian Holovaty a91799a30c Merge pull request #1557 from garrypolley/remove-build-address 
Added /build/ to .gitignore, so it doesn't accidentally get committed
 2013-09-06 08:38:02 -07:00
Andrew Godwin 32838a5beb Make db.migrations ignore South-style migrations. 2013-09-06 10:35:53 -05:00
Aymeric Augustin b80be68e08 Fixed #21052 -- Small performance optimization. 2013-09-06 10:34:32 -05:00
Aymeric Augustin e492ab8e7e Fixed #18719 -- Made force_bytes more consistent with force_text. 2013-09-06 10:28:28 -05:00
Garry Polley f0d9b529a9 ignore build directory, so it doesn't accidentally get committed 2013-09-06 10:25:33 -05:00
Markus Holtermann bd8e1a354c Fixed #20977 -- Fixed writing migrations to disk on Python 3 2013-09-06 09:51:58 -04:00
Preston Timmons 8625c7aab3 Fixed #16096 -- Added origin attribute to template instances. 
Thanks jdunck for the suggestion.
 2013-09-06 09:14:52 -04:00
Loic Bistuer e1266e50b2 Fixed #21015 -- Fixed MigrationLoader when importlib.import_module returns a file module or an empty directory. 2013-09-06 08:30:19 -04:00
Loic Bistuer 82bbb9fe81 Fixed #21014 -- Fixed gobbled ImportError in MigrationLoader. 2013-09-06 08:30:18 -04:00
Eric Boersma 4d13cc56de Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.
 2013-09-05 20:14:58 -04:00
micahhausler 93dd31cadf Fixed #21047 -- Added CLA mesage on the new contributor advice doc 2013-09-05 17:52:36 -04:00
Aymeric Augustin 6a6428a36f Took advantage of django.utils.six.moves.urllib.*. 2013-09-05 14:39:23 -05:00
CHI Cheng ed9cd4fd8b Fixed #21000 -- Made cached_db session backend respect SESSION_CACHE_ALIAS 2013-09-05 10:47:58 -04:00
ersran9 a2374bcf47 Fixed #20918 -- Tidied up implementation of custom assertions 
1. Moved common logic between assertContains and assertNotContains
   into a separate function _assert_contains()

2. Moved common logic between assertTemplateUsed and
   assertTemplateNotUsed into a separate function
   _assert_templateused()

Thanks Marc Tamlyn for the report and review.
 2013-09-05 09:51:23 -04:00
Tim Graham d70908e9c2 Merge pull request #1549 from loic/docs 
Removed "makemigrations --force" from docs since it doesn't actually exist.
 2013-09-05 06:02:28 -07:00
Tim Graham eacf060e01 Fixed #21044 -- Documented django.core.urlresolvers.Resolver404 
Thanks Keryn Knight for the suggestion.
 2013-09-05 08:45:33 -04:00
Tim Graham 7b62b80693 Fixed #20900 -- Documented RemoteUserBackend.authenticate 2013-09-05 05:56:03 -04:00
Tim Graham bab039d74c Fixed #21041 -- Removed a duplicate form in tests. 
Thanks tuxcanfly.
 2013-09-05 05:49:10 -04:00
Tim Graham ebfe42d018 Fixed #21009 -- Added a versionchanged note regarding changes to clean(). 
refs [fb1dd6b13a] and [1c4a9bd9ad]
 2013-09-05 05:47:45 -04:00
Aymeric Augustin 4170b9f402 Tested exc_type instead of exc_value in __exit__. 
exc_value might be None even though there's an exception, at least on
Python 2.6. Thanks Thomas Chaumeny for the report.

Fixed #21034.

Forward-port of a8624b2 from 1.6.x.
 2013-09-04 16:19:04 -05:00
Aymeric Augustin 7b623247e8 Updated six to version 1.4.1. 2013-09-04 15:21:24 -05:00
Loic Bistuer b7af44d474 Removed "makemigrations --force" from docs since it doesn't actually exist. 2013-09-05 02:33:05 +07:00
Loic Bistuer 34d52fd32e Fixed #21010 -- Changed ModelState to only copy _meta.local_fields. 2013-09-04 14:05:59 -04:00
Tim Graham 533d1ab334 Fixed #20958 -- Documented that GenericForeignKey fields can't be accessed in forms. 
Thanks marky1991.
 2013-09-04 13:18:08 -04:00
Paul C. Anagnostopoulos 1ccdc08189 Clarified docs for some tags and filters 2013-09-04 12:32:05 -04:00
Tim Graham 5649c0af9d Fixed "indentation is not a multiple of four" pep8 issues. 2013-09-03 14:22:21 -04:00
Tim Graham cb98ffe8f4 Fixed a couple unclosed file warnings in tests 2013-09-03 13:37:27 -04:00
Tim Graham 3db66b1d65 Updated syncdb -> migrate in tests. 2013-09-03 11:51:34 -04:00
Carl Meyer 8f7f8bf688 Fixed #21026 -- Corrected help for manage.py test command. 2013-09-03 09:50:34 -06:00
Tim Graham 86964a7b4f Silenced deprecation warning regarding old SQL location; refs #14300 2013-09-03 11:10:43 -04:00
Tim Graham 2fd03b39ab Removed references to django.utils.unittest which is PendingDeprecation 2013-09-03 09:55:21 -04:00
Tim Graham ec784c486b Silenced deprecation warnings in SortedDict tests; refs [07876cf02b] 2013-09-03 09:48:46 -04:00
Loic Bistuer 7b04038a7f Fixed #20973 -- Document serving static files without django.contrib.staticfiles 2013-09-03 08:59:08 -04:00
Claude Paroz dd656073ad Fixed #21003 -- Ensured geometry widget return value has SRID 
Thanks Mathieu Leplatre for the report and initial patch.
 2013-09-03 13:53:35 +02:00
Claude Paroz 3550b27a89 Isolated map creation JS code 2013-09-03 13:53:35 +02:00
Tim Graham 3baf1d1042 Fixed #21002 -- Documented JSON session serialization requires string keys 
Thanks jeroen.pulles at redslider.net for the report.
 2013-09-03 07:48:03 -04:00
Claude Paroz b6889c68d7 Prevented rendering attrs to be squashed in OSMWidget 2013-09-03 10:02:55 +02:00
Claude Paroz 6ecbac21a9 Fixed syntax error in OSMWidget 2013-09-03 09:05:01 +02:00
Claude Paroz 973502c047 Fixed gis test to run on non gis-enabled settings 
Refs #20998.
 2013-09-02 14:15:04 +02:00
Claude Paroz 102f26c929 Fixed #20998 -- Allow custom (de)serialization for GIS widgets 
Thanks Mathieu Leplatre for the report and the initial patch.
 2013-09-02 13:32:00 +02:00