2103 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	55584928ca	Merge pull request #561 from mjtamlyn/import-errors ... When importing settings, don't suppress any old error which happens	2013-01-07 05:01:39 -08:00
Marc Tamlyn	c736b80290	Be more informative when reporting import errors.	2013-01-07 12:52:20 +00:00
Tom Christie	152e6d5c0a	Added @michaelmior. Thanks!	2013-01-07 08:57:43 +00:00
Tom Christie	2034009b59	Merge pull request #559 from michaelmior/django1.5-static ... {% static %} template tag for Django 1.5	2013-01-07 00:52:23 -08:00
Michael Mior	9b67a33b92	Use the correct static template tag in Django 1.5	2013-01-06 15:49:12 -05:00
Yuri Prezument	12bb25b372	Added @juanriaza. Thanks	2013-01-05 18:02:26 +02:00
Yuri Prezument	d7f3c86ad1	Updated release notes	2013-01-05 18:01:57 +02:00
Yuri Prezument	e65f407164	Merge pull request #554 from juanriaza/master ... Deprecate django.utils.simplejson in favor of Python 2.6's built-in json module	2013-01-05 07:57:42 -08:00
Juan Riaza	a061e3d9e2	deprecate simplejson	2013-01-05 13:40:02 +01:00
Stephan Groß	8a4e2c1725	removed duplicate entry in 2.1.15	2013-01-05 11:20:36 +01:00
Mark Aaron Shirley	213981cef3	Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-one	2013-01-04 21:11:03 +01:00
Tom Christie	26f9acb45a	Validation errors instead of exceptions when serializers receive incorrect types. Fixes #402.	2013-01-04 14:11:05 +00:00
Tom Christie	eb14278a3b	Add proper validation for updating relational fields with incorrect types. Fixes #446.	2013-01-04 13:50:40 +00:00
Tom Christie	4c86fd46d7	Rename module for basic relational field tests	2013-01-04 13:05:31 +00:00
Tom Christie	6e9865cb71	Fix for #446. Note: Also needs applying to other relational types.	2013-01-03 23:17:31 +00:00
Tom Christie	9b1532b1ea	Merge pull request #548 from maspwr/master ... Remove duplicate release notes line	2013-01-03 14:22:35 -08:00
Mark Shirley	466d4584ae	Remove duplicate release notes line	2013-01-03 23:18:58 +01:00
Tom Christie	ad671022e1	Version 2.1.15	2013-01-03 22:14:11 +00:00
Tom Christie	4223786ddc	Tweak release notes.	2013-01-03 22:11:50 +00:00
Tom Christie	7ed81c3c66	Tweak comment.	2013-01-03 22:06:55 +00:00
Tom Christie	6da21fa796	Merge pull request #541 from yprez/default_and_partial_serializers2 ... Fix "default" values and partial serializers. Fixes #532.	2013-01-03 14:05:36 -08:00
Tom Christie	a122856d46	Tweak behavior of hyperlinked fields with an explicit format suffix.	2013-01-03 21:50:28 +00:00
Tom Christie	bfea7f64ee	Tweak behavior of hyperlinked fields that include an explicit format suffix.	2013-01-03 21:49:29 +00:00
Tom Christie	92ae08207a	Drop unused private save_m2m flag	2013-01-03 21:49:01 +00:00
Tom Christie	05c72a5d30	Fix copyright notice and travis badge	2013-01-03 21:46:39 +00:00
Mark Shirley	610508a5bc	Merge pull request #546 from maspwr/refactor-relation-models ... Move relation tests models into models.py	2013-01-03 04:44:28 -08:00
Xavier Ordoquy	06ae47752f	Also use the compat module in that file.	2013-01-03 12:49:57 +01:00
Xavier Ordoquy	bbc1146320	Python 3 readiness	2013-01-03 11:41:37 +01:00
Xavier Ordoquy	acc97a8a07	Don't require six	2013-01-03 11:41:26 +01:00
Xavier Ordoquy	60250f22c8	Move the various compat things to the compat module.	2013-01-03 11:41:07 +01:00
Xavier Ordoquy	cf51dcc9bb	Straight import is enough.	2013-01-03 10:48:43 +01:00
Xavier Ordoquy	22b1411f41	By default, don't install six.	2013-01-03 10:47:24 +01:00
Mark Aaron Shirley	8fd1f09dad	Move relation tests models into models.py	2013-01-03 10:23:13 +01:00
Yuri Prezument	ed9f20823b	Merge pull request #545 from yprez/filefield-no-files_issue542 ... FileField validation with files=None	2013-01-03 01:11:16 -08:00
Yuri Prezument	097f4c6962	Updated release-notes	2013-01-03 09:40:49 +02:00
Yuri Prezument	3f5e938247	Some cleanup	2013-01-03 08:28:17 +02:00
Yuri Prezument	f2625fc38c	FileField validation - handle case when files=None, fixes #542	2013-01-02 22:12:26 +02:00
Yuri Prezument	1c8fccfdcd	Regression test for #542	2013-01-02 22:07:23 +02:00
Xavier Ordoquy	4b77b3c5ad	Move the urlparse lib compatibility to the compat file.	2013-01-02 19:06:55 +01:00
Xavier Ordoquy	c95fa81cb2	Use new exception style	2013-01-02 19:06:28 +01:00
Xavier Ordoquy	9c7524fc33	Fixed unicode errors.	2013-01-02 19:06:02 +01:00
Xavier Ordoquy	45d48dd52f	urlparse not used here.	2013-01-02 18:54:55 +01:00
Tom Christie	6da9cd5429	Add .patch() method for RetrieveUpdateAPIView	2013-01-02 17:43:43 +00:00
Xavier Ordoquy	92f1109cd8	Exclude non python 3 compatible django verison from the test matrix.	2013-01-02 17:52:31 +01:00
Xavier Ordoquy	1e6927b40d	Merge remote-tracking branch 'reference/py3k' into p3k	2013-01-02 16:17:07 +01:00
Xavier Ordoquy	737349d238	Merge remote-tracking branch 'reference/py3k' into p3k	2013-01-02 16:09:21 +01:00
Yuri Prezument	3873bc8a85	Add explaining comment	2013-01-02 15:57:00 +02:00
Yuri Prezument	6b962cfcf7	Fix "default" and partial serializers, fixes #532	2013-01-02 15:56:46 +02:00
Tom Christie	161432d78c	Added @ahankinson, for PATCH support. Thanks!	2013-01-02 13:49:43 +00:00
Tom Christie	438c2cac1b	Merge branch 'patch'	2013-01-02 13:47:58 +00:00