mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity
14,486 Commits 28 Branches 423 Tags 636 MiB
Commit Graph

14486 Commits

Author SHA1 Message Date
Andrew Godwin 7f3678dc4c Merge branch 'master' into schema-alteration 
Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py
 2013-04-18 17:16:39 +01:00
Aymeric Augustin 93c1576f17 Fixed #20282 -- Typo in WSGI docs. 2013-04-18 11:47:25 +02:00
Simon Charette 356443fd95 Use `LOOKUP_SEP` in `get_or_create`. 2013-04-18 01:55:12 -04:00
Carl Meyer a98465c040 Refs #14567 -- Fixed failing test that wasn't being run. 2013-04-16 13:34:06 -06:00
Claude Paroz 58b3a974fc Fixed #20266 -- Updated view example in CBV introduction 
Thanks jim at hellolocals.com for the report.
 2013-04-16 08:59:55 +02:00
Simon Charette b0bbccf630 Fixed #20262 -- Replaced a reference to the wrong model in the CBV doc. 
Thanks to mossplix for the review and bmispelon for the review.
 2013-04-15 16:23:35 -04:00
Claude Paroz 53df89c0fe Updated get_ogr_db_string in inspectapp tests to support MySQL/Spatialite 
The OGRInspectTest.test_time_field does still not succeed with these
databases (even when removing the postgis guard), but at least it's now
possible to setup a datasource.
 2013-04-15 20:27:58 +02:00
Claude Paroz 1628dfd0b9 Properly used test skipping in OGRInspectTest TestCase 2013-04-15 19:38:24 +02:00
Claude Paroz bfb2504402 Added a tip about --layer param of ogrinspect for databases 
Refs #20260.
 2013-04-15 18:28:20 +02:00
Simon Charette 1de63cccb1 Fixed #20263 -- Corrected wording in the formset documentation. 
Thanks to feraudyh at yahoo.com for the report.
 2013-04-15 12:19:17 -04:00
Matthew Tretter a506b6981b Fixed #18231 -- Made JavaScript i18n not pollute global JS namespace. 
Also, use Django templating for the dynamic generated JS code and use
more idiomatic coding techniques.

Thanks Matthew Tretter for the report and the patch.
 2013-04-14 17:45:01 -03:00
Claude Paroz be9ae693c4 Fixed #17840 -- Generalized named placeholders in form error messages 
Also fixed plural messages for DecimalField.
 2013-04-13 18:55:50 +02:00
Baptiste Mispelon 9ac4dbd7b5 Fixed #4592: Made CheckboxSelectMultiple more like RadioSelect 
I refactored RadioSelect and CheckboxSelectMultiple to
make them inherit from a base class, allowing them to share
the behavior of being able to iterate over their subwidgets.

Thanks to Matt McClanahan for the initial patch and to
Claude Paroz for the review.
 2013-04-13 16:37:27 +02:00
Baptiste Mispelon c4186c2fec Fixed #4117: Apply id attribute to the outer <ul> of RadioSelect 2013-04-13 12:23:25 +02:00
Claude Paroz f56b703b27 Used a Python 3 compatible StringIO in test_utils 2013-04-13 11:38:13 +02:00
Baptiste Mispelon 844fbc85c1 Fixed #19874: Apply id attribute to the outer <ul> of CheckboxSelectMultiple 2013-04-13 11:09:47 +02:00
Claude Paroz 3f05c70be0 Updated a renamed test file 2013-04-13 11:09:47 +02:00
Tim Graham aad5661c6c Fixed #20247 - Added some missing paths in the tutorial. 
Thanks gsavix for the suggestion and patch.
 2013-04-12 19:22:02 -04:00
Preston Timmons 6d96831769 Fixed template_tests so discovery doesn't directly find tests that require setuptools. 2013-04-12 15:42:58 -06:00
Preston Timmons 56e777eba3 Modified view_tests for unittest2 discovery. 2013-04-12 15:42:07 -06:00
Preston Timmons e8446be560 Modified validation to work with unittest2 discovery. 2013-04-12 15:33:22 -06:00
Preston Timmons 612ef3e5c9 Modified utils_tests for unittest2 discovery. 2013-04-12 15:31:58 -06:00
Preston Timmons 3810dc3070 Modified template_tests for unittest2 discovery. 2013-04-12 15:13:59 -06:00
Preston Timmons 44293c5c05 Modified model_fields for unittest2 discovery. 2013-04-12 15:11:12 -06:00
Preston Timmons 3ca3d2206c Modified generic_views for unittest2 discovery. 2013-04-12 15:10:04 -06:00
Preston Timmons 5e84abec14 Modified comment_tests for unittest2 discovery. 2013-04-12 15:07:24 -06:00
Preston Timmons 6f3e139739 Modified test_client_override to work with unittest2 discovery. 2013-04-12 15:05:34 -06:00
Preston Timmons 751b007c98 Modified test_utils to work with unittest2 discovery. 2013-04-12 15:00:48 -06:00
Preston Timmons cdf520ee86 Modified forms_tests to work with unittest2 discovery. 2013-04-12 15:00:17 -06:00
Claude Paroz d58e985aaa Fixed #20252 -- Mentionned geojson Spatialite support from 1.5 
Thanks burton449geo at gmail.com for the report.
 2013-04-12 20:59:56 +02:00
Claude Paroz b04fd579d5 Fixed #20237 (again) Allowed binary parameter to assertContains 2013-04-12 20:12:42 +02:00
Tim Graham 8fc68af9c0 Fixed #20248 - Clarified manage.py vs. django-admin.py 2013-04-12 06:10:26 -04:00
Baptiste Mispelon ab686022f8 Fixed #20211: Document backwards-incompatible change in BoundField.label_tag 
Also cleaned up label escaping and consolidated the test suite regarding
label_tag.
 2013-04-12 10:17:17 +02:00
Claude Paroz 0f99246b6f Documented BoundField.label_tag 2013-04-12 10:17:17 +02:00
Tim Graham 712a792713 Fixed #20243 - Clarified when RelatedManager.remove() exists. 2013-04-11 14:13:09 -04:00
Tim Graham 9a62fc3f93 Merge pull request #1008 from reverie/patch-2 
Removed incorrect phrase from DecimalField docs.
 2013-04-11 10:38:53 -07:00
Andrew Badr 408da7b457 remove confusing phrase from DecimalField docs 
The phrase "if it exists" was used in reference to the `decimal_places`
argument to `DecimalField`, when in fact that field is required.
 2013-04-11 16:27:14 +03:00
Claude Paroz ddfc68379f Changed a deprecated warn() call in libgeos 2013-04-11 11:01:17 +02:00
Claude Paroz fe01404bb9 Fixed #20237 -- Reenabled assertContains with binary parameter 
Thanks Baptiste Mispelon for the review.
 2013-04-11 10:38:24 +02:00
Tim Graham c852d45681 Fixed #20204 - Consistent usage of url() in URL dispatcher documentation 
Thanks Baptiste Mispelon for the patch and dave.lampton@ for the suggestion.
 2013-04-10 20:38:25 -04:00
Julien Phalip 68d6c52ed6 Turned the triage attributes to actual sections so they can be more easily linked to in the documentation. 2013-04-10 17:11:26 -07:00
Baptiste Mispelon e7b9c11c3f Fixed #20231 -- Don't use allow_lazy on smart_split 2013-04-10 13:05:29 +02:00
Claude Paroz 118faa0893 Made usage of assertTemplateUsed in admin_views tests 
Thanks Baptiste Mispelon for the suggestion.
 2013-04-10 10:16:15 +02:00
Preston Holmes 18255779e9 Added some further guidance to "accepted" triage stage 
Now that DDN is gone, I felt it was worth some extra language
about what "accepted" means, and qualify what it means to be "safe"
to start writing a patch.
 2013-04-09 22:39:36 -07:00
Jannis Leidel 7441a29f52 Merge pull request #1003 from bmispelon/fix-tests-3be368c73e 
Fix admin_views tests after commit 3be368c73e.
 2013-04-08 13:06:51 -07:00
Baptiste Mispelon f69396665c Fix admin_views tests after commit 3be368c73e. 2013-04-08 22:02:18 +02:00
Tobias McNulty 161c4da588 Fixed #14019 -- Initialize `SQLInsertCompiler.return_id` attribute. 2013-04-08 13:41:36 -06:00
Aymeric Augustin 4a7292df3b Removed references to the DDN triage state. 
Rephrased "How can I help with triaging?" a bit to reflect the current
practice.
 2013-04-08 20:33:52 +02:00
Jannis Leidel ed576b69f9 Merge pull request #938 from darklow/ticket_20111 
Added more precise message level for succcess and warning messages
 2013-04-08 04:56:57 -07:00
Kaspars Sprogis 3be368c73e Fix #20111 Added more precise message level for succcess and warning messages 2013-04-08 14:54:03 +03:00