Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							344cd865ab 
							
						 
					 
					
						
						
							
							Merge pull request  #1250  from Ian-Foote/choice_field  
						
						... 
						
						
						
						Add choices to options metadata for ChoiceField. 
						
					 
					
						2013-12-03 08:03:02 -08:00 
						 
				 
			
				
					
						
							
							
								Omer Katz 
							
						 
					 
					
						
						
						
						
							
						
						
							b8f8fb7779 
							
						 
					 
					
						
						
							
							Updated the assertion message of the ImageField.  
						
						
						
					 
					
						2013-11-27 13:26:49 +02:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							8d09f56061 
							
						 
					 
					
						
						
							
							Add unittests for ChoiceField metadata.  
						
						... 
						
						
						
						Rename 'name' to 'display_name'. 
						
					 
					
						2013-11-27 11:06:42 +00:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							2484fc9141 
							
						 
					 
					
						
						
							
							Add more context to the ChoiceField metadata.  
						
						
						
					 
					
						2013-11-26 17:10:16 +00:00 
						 
				 
			
				
					
						
							
							
								Ian Foote 
							
						 
					 
					
						
						
						
						
							
						
						
							a38d9d5b24 
							
						 
					 
					
						
						
							
							Add choices to options metadata for ChoiceField.  
						
						
						
					 
					
						2013-11-26 09:33:47 +00:00 
						 
				 
			
				
					
						
							
							
								Mathieu Pillard 
							
						 
					 
					
						
						
						
						
							
						
						
							5325890821 
							
						 
					 
					
						
						
							
							Improve handling of 'empty' values for ChoiceField  
						
						... 
						
						
						
						The empty value defaults back to '' (for backwards-compatibility) but
is changed automatically to None for ModelSerializers if the `null`
property is set on the db field. 
						
					 
					
						2013-11-05 17:21:18 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e370b168 
							
						 
					 
					
						
						
							
							Merge branch 'html-form-rendering'  
						
						
						
					 
					
						2013-10-10 17:33:39 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9e29c63895 
							
						 
					 
					
						
						
							
							Ensure read-only fields don't break with current HTML renderer behavior  
						
						
						
					 
					
						2013-10-10 17:33:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a14f1e8864 
							
						 
					 
					
						
						
							
							Serializers can now be rendered directly to HTML  
						
						
						
					 
					
						2013-10-02 13:45:35 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e441f85109 
							
						 
					 
					
						
						
							
							Drop 1.3 support  
						
						
						
					 
					
						2013-09-25 10:30:04 +01:00 
						 
				 
			
				
					
						
							
							
								Philip Douglas 
							
						 
					 
					
						
						
						
						
							
						
						
							272a6abf91 
							
						 
					 
					
						
						
							
							Try a more localised fix to the data=None problem  
						
						
						
					 
					
						2013-09-13 10:46:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9a5b2eefa9 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2013-08-30 09:28:33 +01:00 
						 
				 
			
				
					
						
							
							
								Mathieu Pillard 
							
						 
					 
					
						
						
						
						
							
						
						
							11071499a7 
							
						 
					 
					
						
						
							
							Make ChoiceField.from_native() follow IntegerField behaviour on empty values  
						
						
						
					 
					
						2013-08-29 18:10:47 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							47d17b088a 
							
						 
					 
					
						
						
							
							Merge branch 'fix_937' of git://github.com/aburgel/django-rest-framework into aburgel-fix_937  
						
						
						
					 
					
						2013-08-23 11:56:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							16ffdedd14 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2013-08-21 21:31:59 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							28ff6fb1ec 
							
						 
					 
					
						
						
							
							Only HTML forms should have implicit default False for boolean fields  
						
						
						
					 
					
						2013-08-19 21:44:47 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							28e44efe25 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 2.4.0  
						
						
						
					 
					
						2013-08-19 20:58:28 +01:00 
						 
				 
			
				
					
						
							
							
								JT 
							
						 
					 
					
						
						
						
						
							
						
						
							2f03870ae1 
							
						 
					 
					
						
						
							
							Fix for "No module named compat"  
						
						
						
					 
					
						2013-08-13 18:48:49 -05:00 
						 
				 
			
				
					
						
							
							
								Alex Burgel 
							
						 
					 
					
						
						
						
						
							
						
						
							db9672d304 
							
						 
					 
					
						
						
							
							Add support for removing field files by sending an empty string  
						
						
						
					 
					
						2013-07-24 17:24:29 -04:00 
						 
				 
			
				
					
						
							
							
								Pavel Zinovkin 
							
						 
					 
					
						
						
						
						
							
						
						
							2e18fbe373 
							
						 
					 
					
						
						
							
							Updated EmailField error message. This one already available in django translations.  
						
						... 
						
						
						
						https://github.com/django/django/blob/master/django/conf/locale/ru/LC_MESSAGES/django.po#L343  
					
						2013-07-21 17:03:58 +04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8f79caf9d1 
							
						 
					 
					
						
						
							
							Use 'force_text', not 'unicode', for compat across python version  
						
						
						
					 
					
						2013-07-05 09:07:18 +01:00 
						 
				 
			
				
					
						
							
							
								Andy Freeland 
							
						 
					 
					
						
						
						
						
							
						
						
							7d43f41e4a 
							
						 
					 
					
						
						
							
							Remove 'Hold down "Control" ...' message from help_text  
						
						... 
						
						
						
						When getting the help_text from a field where `many=True`, Django
appends 'Hold down "Control", or "Command" on a Mac, to select more than
one.' to the help_text. This makes some sense in Django's ModelForms,
but no sense in the API. 
						
					 
					
						2013-07-04 01:51:24 -04:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3fcc01273c 
							
						 
					 
					
						
						
							
							Remove deprecated code  
						
						
						
					 
					
						2013-06-27 20:29:52 +01:00 
						 
				 
			
				
					
						
							
							
								David Sanders 
							
						 
					 
					
						
						
						
						
							
						
						
							fcaca73709 
							
						 
					 
					
						
						
							
							Pep8 lint  
						
						
						
					 
					
						2013-06-11 16:10:25 -06:00 
						 
				 
			
				
					
						
							
							
								David Sanders 
							
						 
					 
					
						
						
						
						
							
						
						
							656897c2da 
							
						 
					 
					
						
						
							
							Update ModelField to work with a broader range of fields  
						
						... 
						
						
						
						Add support for fields that use min and max value validators. 
						
					 
					
						2013-06-11 16:09:32 -06:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							40e09472d8 
							
						 
					 
					
						
						
							
							Never deepcopy validators.  Closes   #913  
						
						
						
					 
					
						2013-06-06 08:56:39 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b15a6ccef2 
							
						 
					 
					
						
						
							
							Serializer field 'default' argument may be a callable  
						
						
						
					 
					
						2013-06-02 20:12:49 +01:00 
						 
				 
			
				
					
						
							
							
								Gustavo Andrés Angulo 
							
						 
					 
					
						
						
						
						
							
						
						
							de1cc5f8c1 
							
						 
					 
					
						
						
							
							Fix default field when is a simple callable function.  
						
						
						
					 
					
						2013-05-29 11:45:54 -05:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fcaee6e580 
							
						 
					 
					
						
						
							
							Clean up OPTIONS implementation  
						
						
						
					 
					
						2013-05-24 23:44:23 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							760e8642bd 
							
						 
					 
					
						
						
							
							Merge branch 'issue-192-expose-fields-for-options' of  https://github.com/grimborg/django-rest-framework  into improved-options-support  
						
						
						
					 
					
						2013-05-24 21:21:56 +01:00 
						 
				 
			
				
					
						
							
							
								Oscar Vilaplana 
							
						 
					 
					
						
						
						
						
							
						
						
							a1deb5eac7 
							
						 
					 
					
						
						
							
							simplified, moved field humanizing to Field. broken tests  
						
						
						
					 
					
						2013-05-23 08:26:55 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cdc3c37465 
							
						 
					 
					
						
						
							
							Merge and styling fixes  
						
						
						
					 
					
						2013-05-21 12:01:56 +01:00 
						 
				 
			
				
					
						
							
							
								David Jones 
							
						 
					 
					
						
						
						
						
							
						
						
							c3fd7c6685 
							
						 
					 
					
						
						
							
							Updated SlugField to raise validation errors for invalid slugs  
						
						
						
					 
					
						2013-05-20 13:04:38 +01:00 
						 
				 
			
				
					
						
							
							
								Oscar Vilaplana 
							
						 
					 
					
						
						
						
						
							
						
						
							e80488b619 
							
						 
					 
					
						
						
							
							Added min_length and max_length  
						
						
						
					 
					
						2013-05-19 15:08:41 +02:00 
						 
				 
			
				
					
						
							
							
								Oscar Vilaplana 
							
						 
					 
					
						
						
						
						
							
						
						
							696c053f4f 
							
						 
					 
					
						
						
							
							s/Single Character/String/  
						
						
						
					 
					
						2013-05-19 15:04:43 +02:00 
						 
				 
			
				
					
						
							
							
								Oscar Vilaplana 
							
						 
					 
					
						
						
						
						
							
						
						
							b915c1d4d8 
							
						 
					 
					
						
						
							
							Made field label optional in OPTIONS  
						
						
						
					 
					
						2013-05-19 11:15:38 +02:00 
						 
				 
			
				
					
						
							
							
								Nikolaus Schlemm 
							
						 
					 
					
						
						
						
						
							
						
						
							c0f3a1c397 
							
						 
					 
					
						
						
							
							Integrated status quo of grimborg's awesome humanize_field() for exposing field metadata via OPTIONS :)  
						
						
						
					 
					
						2013-05-19 09:25:02 +02:00 
						 
				 
			
				
					
						
							
							
								Nikolaus Schlemm 
							
						 
					 
					
						
						
						
						
							
						
						
							9454e23aa9 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options  
						
						
						
					 
					
						2013-05-19 09:02:07 +02:00 
						 
				 
			
				
					
						
							
							
								Nikolaus Schlemm 
							
						 
					 
					
						
						
						
						
							
						
						
							843ae60237 
							
						 
					 
					
						
						
							
							Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options  
						
						... 
						
						
						
						Conflicts:
	rest_framework/tests/fields.py 
						
					 
					
						2013-05-18 18:34:21 +02:00 
						 
				 
			
				
					
						
							
							
								Oscar Vilaplana 
							
						 
					 
					
						
						
						
						
							
						
						
							fecadacab1 
							
						 
					 
					
						
						
							
							added tests for form  
						
						
						
					 
					
						2013-05-18 18:27:53 +02:00 
						 
				 
			
				
					
						
							
							
								Oscar Vilaplana 
							
						 
					 
					
						
						
						
						
							
						
						
							4dffcb5d77 
							
						 
					 
					
						
						
							
							Added humanized field names and types  
						
						
						
					 
					
						2013-05-18 18:10:17 +02:00 
						 
				 
			
				
					
						
							
							
								Ryan Kaskel 
							
						 
					 
					
						
						
						
						
							
						
						
							579f77ceaa 
							
						 
					 
					
						
						
							
							Move function to compat.  
						
						
						
					 
					
						2013-05-18 17:04:17 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan Kaskel 
							
						 
					 
					
						
						
						
						
							
						
						
							33f702d306 
							
						 
					 
					
						
						
							
							Merge latest changes from master.  
						
						
						
					 
					
						2013-05-18 16:26:17 +01:00 
						 
				 
			
				
					
						
							
							
								Ryan Kaskel 
							
						 
					 
					
						
						
						
						
							
						
						
							10e451a85a 
							
						 
					 
					
						
						
							
							Handle Python 3 strings and lazy strings.  
						
						
						
					 
					
						2013-05-18 16:21:18 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Törnqvist 
							
						 
					 
					
						
						
						
						
							
						
						
							48c1b2233b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into mjtorn-master  
						
						... 
						
						
						
						Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py
Fixed conflicts 
						
					 
					
						2013-05-18 18:13:31 +03:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							9f9cb97d65 
							
						 
					 
					
						
						
							
							Add TestCases for default field values  
						
						
						
					 
					
						2013-05-18 16:24:54 +02:00 
						 
				 
			
				
					
						
							
							
								Ryan Kaskel 
							
						 
					 
					
						
						
						
						
							
						
						
							22874e441d 
							
						 
					 
					
						
						
							
							Merge latest changes from master.  
						
						
						
					 
					
						2013-05-18 14:17:50 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6d425aa3be 
							
						 
					 
					
						
						
							
							Merge pull request  #831  from brianz/master  
						
						... 
						
						
						
						Allow nested fields to be missing 
						
					 
					
						2013-05-18 04:36:00 -07:00 
						 
				 
			
				
					
						
							
							
								Pablo Recio 
							
						 
					 
					
						
						
						
						
							
						
						
							53a8004401 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 725-blank-choice-dash  
						
						... 
						
						
						
						Conflicts:
	rest_framework/tests/fields.py 
						
					 
					
						2013-05-18 12:51:40 +02:00 
						 
				 
			
				
					
						
							
							
								Pablo Recio 
							
						 
					 
					
						
						
						
						
							
						
						
							ab8bd566f9 
							
						 
					 
					
						
						
							
							Adding BLANK_CHOICE_DASH as a choice if the model's field isn't required  
						
						
						
					 
					
						2013-05-18 12:41:52 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a73c16b85f 
							
						 
					 
					
						
						
							
							serializers.Field respects ordering on dicts if it exists.   Closes   #832  
						
						
						
					 
					
						2013-05-18 11:27:48 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Törnqvist 
							
						 
					 
					
						
						
						
						
							
						
						
							3691cd2ffd 
							
						 
					 
					
						
						
							
							Use smart_text() instead of nonexistant smart_unicode()  
						
						
						
					 
					
						2013-05-18 13:26:59 +03:00 
						 
				 
			
				
					
						
							
							
								Markus Törnqvist 
							
						 
					 
					
						
						
						
						
							
						
						
							85faebbb75 
							
						 
					 
					
						
						
							
							Merge branch 'mikee2185-master' into mjtorn-master  
						
						... 
						
						
						
						Conflicts:
	rest_framework/fields.py
	rest_framework/serializers.py
	rest_framework/tests/models.py
	rest_framework/tests/serializer.py
Fixed all the conflicts. 
						
					 
					
						2013-05-18 13:24:36 +03:00 
						 
				 
			
				
					
						
							
							
								Brian Zambrano 
							
						 
					 
					
						
						
						
						
							
						
						
							24c9c455fe 
							
						 
					 
					
						
						
							
							Allow for missing non-required nested objects.  
						
						... 
						
						
						
						Serializer fields which are themselves serializers should not be required.
Specifically, if a nested object is set to "required=False", it should be
possible to serialize the main object and have the sub-object set to None/null. 
						
					 
					
						2013-05-13 14:41:12 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b443560080 
							
						 
					 
					
						
						
							
							Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings.   Closes   #798  
						
						
						
					 
					
						2013-05-08 20:38:50 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dc7b1d6430 
							
						 
					 
					
						
						
							
							2.2's PendingDeprecationWarnings now become DeprecationWarnings.  2.3's PendingDeprecationWarnings added.  
						
						
						
					 
					
						2013-04-29 12:45:00 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d985aec3c9 
							
						 
					 
					
						
						
							
							DecimalField  
						
						
						
					 
					
						2013-04-26 13:59:06 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							95abe6e844 
							
						 
					 
					
						
						
							
							Cleanup docstrings  
						
						
						
					 
					
						2013-04-25 12:47:34 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							cac6697025 
							
						 
					 
					
						
						
							
							Return Decimal instance instead of string  
						
						
						
					 
					
						2013-04-15 15:24:14 +02:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							9d80f01bce 
							
						 
					 
					
						
						
							
							Fix init call  
						
						
						
					 
					
						2013-04-15 15:15:55 +02:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							ad436d966f 
							
						 
					 
					
						
						
							
							Add DecimalField support  
						
						
						
					 
					
						2013-04-15 13:02:18 +02:00 
						 
				 
			
				
					
						
							
							
								Matteo Suppo 
							
						 
					 
					
						
						
						
						
							
						
						
							b5640bb778 
							
						 
					 
					
						
						
							
							Forcing translations of lazy translatable strings in Field to_native method  
						
						
						
					 
					
						2013-03-23 14:18:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8adde506e8 
							
						 
					 
					
						
						
							
							Default date/time fields now return python date/time objects again by default  
						
						
						
					 
					
						2013-03-21 08:41:54 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							20fd738c85 
							
						 
					 
					
						
						
							
							iso formated datetime aware fields with +0000 offset should use 'Z' suffix instead  
						
						
						
					 
					
						2013-03-20 13:05:59 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a798a5350a 
							
						 
					 
					
						
						
							
							Fix duplicated database queries for paginated lists.  
						
						... 
						
						
						
						Closes  #713 . 
					
						2013-03-13 11:42:12 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ad336cc636 
							
						 
					 
					
						
						
							
							Fix broken None value for TimeField.  
						
						... 
						
						
						
						Refs #707 . 
						
					 
					
						2013-03-07 09:03:53 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Stone 
							
						 
					 
					
						
						
						
						
							
						
						
							2f8d8b499e 
							
						 
					 
					
						
						
							
							Patched DateField and DateTimeField to check for None values before trying to perform date(time) conversion.  
						
						... 
						
						
						
						Signed-off-by: Kevin Stone <kevinastone@gmail.com> 
						
					 
					
						2013-03-06 15:16:37 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							1106596c80 
							
						 
					 
					
						
						
							
							Clean ups to datetime formatting  
						
						
						
					 
					
						2013-03-06 12:19:39 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c20ebe95f6 
							
						 
					 
					
						
						
							
							Merge datetime formats  
						
						
						
					 
					
						2013-03-05 17:50:28 +00:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							5e5cd6f7f7 
							
						 
					 
					
						
						
							
							Fix for django 1.3 compatibility  
						
						
						
					 
					
						2013-03-01 17:15:39 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							12905449a5 
							
						 
					 
					
						
						
							
							Add format class attributes  
						
						
						
					 
					
						2013-03-01 16:59:47 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							9c964cf37b 
							
						 
					 
					
						
						
							
							Add new ISO8601 setting + integration  
						
						
						
					 
					
						2013-03-01 16:50:18 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							a9d36d4726 
							
						 
					 
					
						
						
							
							Add docs update - part 1  
						
						
						
					 
					
						2013-03-01 16:50:18 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							f208d8d2bb 
							
						 
					 
					
						
						
							
							Add drf settings + output format + testcases  
						
						
						
					 
					
						2013-03-01 16:50:18 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							b2165cc76a 
							
						 
					 
					
						
						
							
							Fix for python 3 support - thanks @Linovia  
						
						
						
					 
					
						2013-03-01 16:48:20 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							9157db5da0 
							
						 
					 
					
						
						
							
							Add better date / datetime validation (pull 2)  
						
						... 
						
						
						
						addition to #631  with update to master + timefield support 
						
					 
					
						2013-03-01 16:48:20 +01:00 
						 
				 
			
				
					
						
							
							
								Yuri Prezument 
							
						 
					 
					
						
						
						
						
							
						
						
							5f531fc1ea 
							
						 
					 
					
						
						
							
							Catch TypeError as well as ValueError when parsing dates, ref  #699  
						
						
						
					 
					
						2013-02-21 15:54:31 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							367909e2c2 
							
						 
					 
					
						
						
							
							Merge pull request  #657  from dgaus/master  
						
						... 
						
						
						
						Make is_simple_callable consider default arguments 
						
					 
					
						2013-02-15 01:13:14 -08:00 
						 
				 
			
				
					
						
							
							
								Andreas Pelme 
							
						 
					 
					
						
						
						
						
							
						
						
							5a5df18d18 
							
						 
					 
					
						
						
							
							Added a serializer TimeField  
						
						
						
					 
					
						2013-02-14 21:19:51 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Gaustein 
							
						 
					 
					
						
						
						
						
							
						
						
							40b13a869b 
							
						 
					 
					
						
						
							
							Make is_simple_callable consider fields which have default arguments  
						
						
						
					 
					
						2013-02-13 20:34:23 -03:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f505b2e440 
							
						 
					 
					
						
						
							
							Clean up field_to_native logic  
						
						
						
					 
					
						2013-02-12 22:59:01 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							670ac25b25 
							
						 
					 
					
						
						
							
							Allow serializers to handle dicts as well as objects.   Fixes   #447 .  
						
						
						
					 
					
						2013-02-07 12:57:40 +00:00 
						 
				 
			
				
					
						
							
							
								Marc Tamlyn 
							
						 
					 
					
						
						
						
						
							
						
						
							bd7977eed7 
							
						 
					 
					
						
						
							
							Purge naked excepts.  
						
						... 
						
						
						
						Most of these had obvious exceptions which would be thrown. Some I'm not
sure about but they should at least catch only Exception so as not to
ignore SystemExit and other inappropriate Error classes. 
						
					 
					
						2013-02-06 13:05:17 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8e846bdf52 
							
						 
					 
					
						
						
							
							Merge branch 'py3k' into 2.2  
						
						... 
						
						
						
						Conflicts:
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_slug.py 
						
					 
					
						2013-02-04 20:37:09 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c7b1c585 
							
						 
					 
					
						
						
							
							Merge branch 'p3k' of  https://github.com/linovia/django-rest-framework  into working  
						
						... 
						
						
						
						Conflicts:
	rest_framework/authentication.py
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/settings.py
	rest_framework/tests/authentication.py
	rest_framework/tests/genericrelations.py
	rest_framework/tests/generics.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_nested.py
	rest_framework/tests/relations_pk.py
	rest_framework/tests/serializer.py 
						
					 
					
						2013-02-01 11:58:55 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e4ac566625 
							
						 
					 
					
						
						
							
							Add dprecation warnings  
						
						
						
					 
					
						2013-01-30 20:33:50 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							be6df3ae3c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into many-fields  
						
						... 
						
						
						
						Conflicts:
	rest_framework/relations.py 
						
					 
					
						2013-01-30 13:41:56 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9a4d01d687 
							
						 
					 
					
						
						
							
							Formatting fixes  
						
						
						
					 
					
						2013-01-30 12:41:26 +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 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							60250f22c8 
							
						 
					 
					
						
						
							
							Move the various compat things to the compat module.  
						
						
						
					 
					
						2013-01-03 11:41:07 +01: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 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							45d48dd52f 
							
						 
					 
					
						
						
							
							urlparse not used here.  
						
						
						
					 
					
						2013-01-02 18:54:55 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							8fad0a727a 
							
						 
					 
					
						
						
							
							Relation fields move into relations.py  
						
						
						
					 
					
						2012-12-31 08:53:40 +00:00 
						 
				 
			
				
					
						
							
							
								Michal Dvorak 
							
						 
					 
					
						
						
						
						
							
						
						
							5d7d51ed9d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
					 
					
						2012-12-23 22:05:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Aaron Shirley 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a1256b1c 
							
						 
					 
					
						
						
							
							Update RelatedField#field_from_native coding style  
						
						
						
					 
					
						2012-12-21 11:33:01 -08:00 
						 
				 
			
				
					
						
							
							
								Michal Dvorak (cen38289) 
							
						 
					 
					
						
						
						
						
							
						
						
							5ba2437f2d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tom/master'  
						
						... 
						
						
						
						Conflicts:
	rest_framework/tests/serializer.py 
						
					 
					
						2012-12-21 10:53:23 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Aaron Shirley 
							
						 
					 
					
						
						
						
						
							
						
						
							2f5582a1a6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into related-required  
						
						
						
					 
					
						2012-12-19 15:24:22 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							46b313315a 
							
						 
					 
					
						
						
							
							Merge pull request  #510  from joual/master  
						
						... 
						
						
						
						Fixes  #509  
					
						2012-12-19 14:39:11 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Aaron Shirley 
							
						 
					 
					
						
						
						
						
							
						
						
							5c680c36e4 
							
						 
					 
					
						
						
							
							Check if RelatedField is required.  
						
						
						
					 
					
						2012-12-19 09:26:40 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6611514134 
							
						 
					 
					
						
						
							
							Whitespace  
						
						
						
					 
					
						2012-12-18 19:20:10 +00:00 
						 
				 
			
				
					
						
							
							
								Michal Dvorak (cen38289) 
							
						 
					 
					
						
						
						
						
							
						
						
							8ac77eaae8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tom/master'  
						
						... 
						
						
						
						Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py 
						
					 
					
						2012-12-17 17:01:00 +01:00 
						 
				 
			
				
					
						
							
							
								Joel Marcotte 
							
						 
					 
					
						
						
						
						
							
						
						
							262d9c2489 
							
						 
					 
					
						
						
							
							Final commit to restore the fix  
						
						... 
						
						
						
						Signed-off-by: Joel Marcotte <skaner@gmail.com> 
						
					 
					
						2012-12-15 16:52:28 -05:00 
						 
				 
			
				
					
						
							
							
								Joel Marcotte 
							
						 
					 
					
						
						
						
						
							
						
						
							6f25181979 
							
						 
					 
					
						
						
							
							Reverting commit to previous state to see if the test is only relevant to django 1.5b2  
						
						
						
					 
					
						2012-12-15 16:45:04 -05:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							35f72cecb1 
							
						 
					 
					
						
						
							
							Fix model validation exclusions.   Fixes   #500 .   Fixes   #506 .  
						
						
						
					 
					
						2012-12-15 20:40:41 +00:00 
						 
				 
			
				
					
						
							
							
								Joel Marcotte 
							
						 
					 
					
						
						
						
						
							
						
						
							71ccab593b 
							
						 
					 
					
						
						
							
							Fix for JSON integer match to a ChoiceField  
						
						
						
					 
					
						2012-12-15 10:35:06 -05:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							54d9cd4dba 
							
						 
					 
					
						
						
							
							fixed validationerror usage  
						
						
						
					 
					
						2012-12-13 16:44:45 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4058223309 
							
						 
					 
					
						
						
							
							Fix broken nested fields  
						
						
						
					 
					
						2012-12-11 21:07:25 +00:00 
						 
				 
			
				
					
						
							
							
								Venkat 
							
						 
					 
					
						
						
						
						
							
						
						
							1815cdd247 
							
						 
					 
					
						
						
							
							Making sure the assert does not fail  when required=False, read_only=True  
						
						
						
					 
					
						2012-12-10 17:46:21 -08:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ac2720afcb 
							
						 
					 
					
						
						
							
							Add null related field option  
						
						
						
					 
					
						2012-12-08 13:00:49 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							733f03fba3 
							
						 
					 
					
						
						
							
							Fix for emptystring as nullable FK  
						
						
						
					 
					
						2012-12-08 12:48:38 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							303bc7cf95 
							
						 
					 
					
						
						
							
							Support nullable FKs, with blank=True  
						
						
						
					 
					
						2012-12-07 21:32:45 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a463ddbb37 
							
						 
					 
					
						
						
							
							Merge pull request  #470  from  minddust/fix-#469  
						
						... 
						
						
						
						fixed  #469  - RegexField <--> BrowsableAPI Bug 
					
						2012-12-06 14:58:18 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Richards 
							
						 
					 
					
						
						
						
						
							
						
						
							3867d9deb1 
							
						 
					 
					
						
						
							
							Added support for 'true'/'false' as valid boolean data  
						
						
						
					 
					
						2012-12-04 11:07:31 -08:00 
						 
				 
			
				
					
						
							
							
								Michal Dvorak (cen38289) 
							
						 
					 
					
						
						
						
						
							
						
						
							2a82b64963 
							
						 
					 
					
						
						
							
							Moved smart_unicode to Field ctor, to mimic Django Forms behavior.  
						
						
						
					 
					
						2012-12-04 14:22:41 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							e044fa089b 
							
						 
					 
					
						
						
							
							fixed   #469  - RegexField <--> BrowsableAPI Bug  
						
						
						
					 
					
						2012-12-04 09:40:23 +01:00 
						 
				 
			
				
					
						
							
							
								Michal Dvorak 
							
						 
					 
					
						
						
						
						
							
						
						
							dea0f9129c 
							
						 
					 
					
						
						
							
							Fixed screwed formatting  
						
						
						
					 
					
						2012-12-03 19:10:57 +01:00 
						 
				 
			
				
					
						
							
							
								Michal Dvorak (cen38289) 
							
						 
					 
					
						
						
						
						
							
						
						
							9ae0ca1cae 
							
						 
					 
					
						
						
							
							#467  Added label and help_text to Field  
						
						
						
					 
					
						2012-12-03 17:26:01 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							5fad46d7e2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'reference/master' into p3k  
						
						
						
					 
					
						2012-12-02 12:43:32 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							968f4a5ca4 
							
						 
					 
					
						
						
							
							Merge branch 'custom-serializer-form-class' of  https://github.com/ludwigkraatz/django-rest-framework  into mergebranch#390  
						
						... 
						
						
						
						Conflicts:
	rest_framework/fields.py
	rest_framework/renderers.py
Manually solved 
						
					 
					
						2012-11-29 01:10:32 +01:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							e348ee9255 
							
						 
					 
					
						
						
							
							52 tests passing. Refactored a few string / byte io.  
						
						
						
					 
					
						2012-11-23 01:12:33 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							ec437e3e0f 
							
						 
					 
					
						
						
							
							Merge pull request  #441  from dbachrach/master  
						
						... 
						
						
						
						Add widgets for DateField and DateTimeField 
						
					 
					
						2012-11-22 02:17:20 -08:00 
						 
				 
			
				
					
						
							
							
								Xavier Ordoquy 
							
						 
					 
					
						
						
						
						
							
						
						
							b3698acb6c 
							
						 
					 
					
						
						
							
							First passing test under p3k \o/  
						
						
						
					 
					
						2012-11-22 00:20:49 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Aaron Shirley 
							
						 
					 
					
						
						
						
						
							
						
						
							0876bed963 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into partial-update  
						
						
						
					 
					
						2012-11-21 09:37:22 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Aaron Shirley 
							
						 
					 
					
						
						
						
						
							
						
						
							1adfc41dc7 
							
						 
					 
					
						
						
							
							partial argument should override required  
						
						
						
					 
					
						2012-11-21 09:36:37 -08:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							6ba4df8a27 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into regex_field  
						
						... 
						
						
						
						Conflicts:
	docs/topics/release-notes.md 
						
					 
					
						2012-11-21 11:56:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8e8b23b6a9 
							
						 
					 
					
						
						
							
							Merge pull request  #430  from j4mie/serializer-method-field  
						
						... 
						
						
						
						Serializer method field 
						
					 
					
						2012-11-20 15:30:30 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Aaron Shirley 
							
						 
					 
					
						
						
						
						
							
						
						
							c3644234cd 
							
						 
					 
					
						
						
							
							Add support for partial serializer updates  
						
						
						
					 
					
						2012-11-20 11:01:21 -08:00 
						 
				 
			
				
					
						
							
							
								Dustin Bachrach 
							
						 
					 
					
						
						
						
						
							
						
						
							7bf03bbd66 
							
						 
					 
					
						
						
							
							Add widgets for DateField and DateTimeField.  
						
						
						
					 
					
						2012-11-20 08:27:52 -08:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							86484668f6 
							
						 
					 
					
						
						
							
							added RegexField  
						
						
						
					 
					
						2012-11-20 15:38:50 +01:00 
						 
				 
			
				
					
						
							
							
								Jamie Matthews 
							
						 
					 
					
						
						
						
						
							
						
						
							de5b071d67 
							
						 
					 
					
						
						
							
							Add SerializerMethodField  
						
						
						
					 
					
						2012-11-19 17:22:17 +00:00 
						 
				 
			
				
					
						
							
							
								Jacob Magnusson 
							
						 
					 
					
						
						
						
						
							
						
						
							d67ee708e5 
							
						 
					 
					
						
						
							
							Add support for min_length / max_length keywords  
						
						... 
						
						
						
						on basic ModelFields 
						
					 
					
						2012-11-18 18:14:21 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e801e21210 
							
						 
					 
					
						
						
							
							Merge pull request  #422  from markotibold/max_length_for_modelserializers  
						
						... 
						
						
						
						Max length for modelserializers 
						
					 
					
						2012-11-16 14:54:16 -08:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							1a436dd6d9 
							
						 
					 
					
						
						
							
							Added URLField and SlugField.  
						
						... 
						
						
						
						Fixed test_modelserializer_max_length_exceeded 
						
					 
					
						2012-11-16 22:43:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							403886b79b 
							
						 
					 
					
						
						
							
							Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into file_and_image_fields  
						
						
						
					 
					
						2012-11-15 22:48:22 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							e112a806d8 
							
						 
					 
					
						
						
							
							.to_native() now returns the file-name.  
						
						
						
					 
					
						2012-11-14 21:40:52 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							c35b9eb065 
							
						 
					 
					
						
						
							
							Processed review comments.  
						
						... 
						
						
						
						No type checking in .restore_fields()
Added missing BytesIO import. 
						
					 
					
						2012-11-14 21:13:23 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							44ff2e0add 
							
						 
					 
					
						
						
							
							fixed some typos  
						
						
						
					 
					
						2012-11-14 19:36:29 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							8cdbc0a33a 
							
						 
					 
					
						
						
							
							Properly render file inputs in the Browsable api.  
						
						
						
					 
					
						2012-11-14 00:09:39 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							5443dd5f3c 
							
						 
					 
					
						
						
							
							Added a FileField and an ImageField (copied from django.forms.fields).  
						
						... 
						
						
						
						Adjusted generics, mixins and serializers to take a `files` arg where applicable. 
						
					 
					
						2012-11-13 23:26:17 +01:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							2a2ce406bc 
							
						 
					 
					
						
						
							
							Fixes   #380  
						
						
						
					 
					
						2012-11-10 12:23:19 +01:00 
						 
				 
			
				
					
						
							
							
								Ludwig Kraatz 
							
						 
					 
					
						
						
						
						
							
						
						
							5cd64cc551 
							
						 
					 
					
						
						
							
							Fields specify what FormFieldClass should be used by BrowsableApiRenderer  
						
						... 
						
						
						
						added SerializerField Attribute "form_field_class" and defaults for
existing Fields 
						
					 
					
						2012-11-08 16:02:03 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							f3c94acc4a 
							
						 
					 
					
						
						
							
							fixed typo  
						
						
						
					 
					
						2012-11-07 17:19:13 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6d3bb67aa6 
							
						 
					 
					
						
						
							
							Add pk_url_kwarg to hyperlinked fields  
						
						
						
					 
					
						2012-11-06 17:11:52 +00:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							2c52a2581f 
							
						 
					 
					
						
						
							
							added slug support for HyperlinkedIdentityField  
						
						
						
					 
					
						2012-11-06 17:02:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d9be6140dc 
							
						 
					 
					
						
						
							
							More defensive coding.  Refs:  #348  
						
						
						
					 
					
						2012-11-06 11:01:53 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0d2377c148 
							
						 
					 
					
						
						
							
							Respect false value defaults on WritableField.   Fixes   #377 .  
						
						
						
					 
					
						2012-11-06 10:55:58 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							470878a591 
							
						 
					 
					
						
						
							
							Allow slug_url_kwarg to be overidden by subclass.   Fixes   #373  
						
						
						
					 
					
						2012-11-06 10:47:26 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							867033e676 
							
						 
					 
					
						
						
							
							slug_url_kwarg should default to same as slug_field  
						
						
						
					 
					
						2012-11-05 16:43:44 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							9731b95fc3 
							
						 
					 
					
						
						
							
							Merge pull request  #347  from minddust/master  
						
						... 
						
						
						
						support for passing custom slug options to HyperlinkedRelatedField 
						
					 
					
						2012-11-05 08:36:59 -08:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							0a660a531a 
							
						 
					 
					
						
						
							
							fixed typo  
						
						
						
					 
					
						2012-11-05 16:43:03 +01:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							03095f607a 
							
						 
					 
					
						
						
							
							added testcase for custom slug field in hyperlinkedrelatedfield  
						
						
						
					 
					
						2012-11-05 16:37:37 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							33be4b43b9 
							
						 
					 
					
						
						
							
							queryset argument is now optional on writable model fields. 
						
						
						
					 
					
						2012-11-05 12:51:04 +00:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							44449fa1f5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
					 
					
						2012-11-05 11:45:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5b397e50dd 
							
						 
					 
					
						
						
							
							Include queryset missing exception on writable SlugField  
						
						
						
					 
					
						2012-11-05 10:16:23 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b468dd6271 
							
						 
					 
					
						
						
							
							Merge pull request  #359  from tomchristie/relationship_tests  
						
						... 
						
						
						
						Relationship tests 
						
					 
					
						2012-11-02 14:08:49 -07:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							8ec54e6a9f 
							
						 
					 
					
						
						
							
							Tweaks  
						
						
						
					 
					
						2012-11-02 20:56:51 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6eaec7a0ec 
							
						 
					 
					
						
						
							
							foreign key tests  
						
						
						
					 
					
						2012-11-02 20:53:33 +00:00 
						 
				 
			
				
					
						
							
							
								Jacob Magnusson 
							
						 
					 
					
						
						
						
						
							
						
						
							a6806f0307 
							
						 
					 
					
						
						
							
							Apply to_native on dictionary keys as well  
						
						
						
					 
					
						2012-11-02 21:48:16 +01:00 
						 
				 
			
				
					
						
							
							
								Jacob Magnusson 
							
						 
					 
					
						
						
						
						
							
						
						
							3de61d200c 
							
						 
					 
					
						
						
							
							Don't convert dictionary into a string representation  
						
						
						
					 
					
						2012-11-02 20:55:58 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b9bff2a984 
							
						 
					 
					
						
						
							
							Fix issues with pk related fields in the browsable API.  
						
						
						
					 
					
						2012-11-02 14:05:14 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							36e21153fb 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2012-11-01 23:11:28 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d327c5f531 
							
						 
					 
					
						
						
							
							Relational field support in browseable API.  
						
						... 
						
						
						
						Add slug relational fields.
Add quickstart. 
						
					 
					
						2012-11-01 23:04:13 +00:00 
						 
				 
			
				
					
						
							
							
								Otto Yiu 
							
						 
					 
					
						
						
						
						
							
						
						
							756297ad1d 
							
						 
					 
					
						
						
							
							fix 'from_native' method when rel is None  
						
						... 
						
						
						
						'NoneType' object has no attribute 'to' 
						
					 
					
						2012-10-31 21:40:20 -07:00 
						 
				 
			
				
					
						
							
							
								Stephan Groß 
							
						 
					 
					
						
						
						
						
							
						
						
							ff7725f05e 
							
						 
					 
					
						
						
							
							added support for custom slug field and kwargs  
						
						... 
						
						
						
						without subclassing HyperlinkedRelatedField and overwriting
slug_url_kwarg and slug_field there is no possibility to use other
fields / arguments. now you can do something like this:
url(r'^users/(?P<username>\w[\w-]*)$', UserInstance.as_view(),
name='user-detail')
class ProjectSerializer(serializers.HyperlinkedModelSerializer):
    created_by =
serializers.HyperlinkedRelatedField(view_name='user-detail',
slug_url_kwargs='username', slug_field='username') 
						
					 
					
						2012-10-31 15:30:01 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cea907f172 
							
						 
					 
					
						
						
							
							Raise nicer exception if queryset not Set on writable related field.  Refs:  #338  
						
						
						
					 
					
						2012-10-30 11:10:23 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							0047a46020 
							
						 
					 
					
						
						
							
							Merge fixes for 'blank=True' fields.   Fixes   #324 ,  Fixes   #325  
						
						... 
						
						
						
						Thanks to @Roarster. 
						
					 
					
						2012-10-30 11:03:03 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							5670cb03bf 
							
						 
					 
					
						
						
							
							Allow use of absolute URLs when deserializing hyperlinked fields  
						
						
						
					 
					
						2012-10-30 10:49:01 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							51a53b497b 
							
						 
					 
					
						
						
							
							Merge pull request  #335  from tomchristie/related-field-as-instance  
						
						... 
						
						
						
						Writable related fields should return a model instance from .from_native... 
						
					 
					
						2012-10-30 03:32:55 -07:00 
						 
				 
			
				
					
						
							
							
								Marko Tibold 
							
						 
					 
					
						
						
						
						
							
						
						
							4d90bb4af4 
							
						 
					 
					
						
						
							
							Fix some typos.  
						
						
						
					 
					
						2012-10-30 00:30:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d206c686a6 
							
						 
					 
					
						
						
							
							Fixes for urls with suffixes  
						
						
						
					 
					
						2012-10-29 17:08:38 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							49f87cfbab 
							
						 
					 
					
						
						
							
							Deal with None and missing values  
						
						
						
					 
					
						2012-10-29 14:10:38 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f4edd92566 
							
						 
					 
					
						
						
							
							Writable welated fields should return a model instance from .from_native(), not a pk  
						
						
						
					 
					
						2012-10-29 12:51:21 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6e4ab09aae 
							
						 
					 
					
						
						
							
							readonly -> read_only  
						
						
						
					 
					
						2012-10-28 20:21:45 +00:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							fc4614a89c 
							
						 
					 
					
						
						
							
							Whitespace  
						
						
						
					 
					
						2012-10-26 12:46:41 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Strachan 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a0d52fd7 
							
						 
					 
					
						
						
							
							#314  Fix for manytomany field being required in the payload even though the field is specified as readonly in the serializer  
						
						
						
					 
					
						2012-10-22 22:24:26 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							95a670de41 
							
						 
					 
					
						
						
							
							Merge field changes: .default and .widget  
						
						
						
					 
					
						2012-10-22 15:24:09 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							93f1aa4f69 
							
						 
					 
					
						
						
							
							Remove initial kwarg, add default.  
						
						
						
					 
					
						2012-10-21 17:41:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dab177e29e 
							
						 
					 
					
						
						
							
							Drop help_text  
						
						
						
					 
					
						2012-10-19 09:20:54 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							643d3491a6 
							
						 
					 
					
						
						
							
							First pass at pastebin tutorial  
						
						
						
					 
					
						2012-10-18 23:48:52 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c341799344 
							
						 
					 
					
						
						
							
							Apply readonly on RelatedField  
						
						
						
					 
					
						2012-10-18 22:19:54 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d1746e2f3c 
							
						 
					 
					
						
						
							
							Allow callables in dotted notation like Field(source='foo.bar')  
						
						
						
					 
					
						2012-10-18 22:03:48 +01:00 
						 
				 
			
				
					
						
							
							
								Jens Alm 
							
						 
					 
					
						
						
						
						
							
						
						
							9f3ff0105a 
							
						 
					 
					
						
						
							
							Removed serializer.TextField and related tests  
						
						
						
					 
					
						2012-10-15 14:09:29 +02:00 
						 
				 
			
				
					
						
							
							
								Jens Alm 
							
						 
					 
					
						
						
						
						
							
						
						
							241be38340 
							
						 
					 
					
						
						
							
							Added TextField to recognized fields  
						
						
						
					 
					
						2012-10-15 09:14:01 +02:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							dc52ceaaa2 
							
						 
					 
					
						
						
							
							Remove Field handling relations/relationship managers - use RelatedField/ManyRelatedField instead  
						
						
						
					 
					
						2012-10-09 10:25:01 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							65f592866c 
							
						 
					 
					
						
						
							
							Fix issue where required fields were not being properly validated.  Also make model fields with a default value be not required  
						
						
						
					 
					
						2012-10-08 17:53:18 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cc21948a69 
							
						 
					 
					
						
						
							
							Fix django 1.3 bug  
						
						
						
					 
					
						2012-10-05 17:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							7218bcbade 
							
						 
					 
					
						
						
							
							Add test for non-GET methods to api_view decorator  
						
						
						
					 
					
						2012-10-05 15:55:45 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							2a89cb4fb7 
							
						 
					 
					
						
						
							
							Fix view_name argument to HyperlinkedIdentityField  
						
						
						
					 
					
						2012-10-05 15:47:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							102e906840 
							
						 
					 
					
						
						
							
							Fix view_name argument to HyperlinkedIdentityField  
						
						
						
					 
					
						2012-10-05 15:46:45 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							484ee8cc27 
							
						 
					 
					
						
						
							
							Add view_name argument to HyperlinkedIdentityField  
						
						
						
					 
					
						2012-10-05 15:44:08 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							693892ed01 
							
						 
					 
					
						
						
							
							Fix for field to make it easier to access field relationships  
						
						
						
					 
					
						2012-10-04 22:07:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cc0d2601b8 
							
						 
					 
					
						
						
							
							Minor fixes  
						
						
						
					 
					
						2012-10-04 21:36:40 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							c91d926b06 
							
						 
					 
					
						
						
							
							Initial tests for hyperlinked relationships  
						
						
						
					 
					
						2012-10-04 16:58:18 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							55e9cbecac 
							
						 
					 
					
						
						
							
							Tweaks  
						
						
						
					 
					
						2012-10-04 15:01:44 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							3a06dde884 
							
						 
					 
					
						
						
							
							Clean up field classes  
						
						
						
					 
					
						2012-10-04 13:28:14 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d89d6887d2 
							
						 
					 
					
						
						
							
							HyperlinkedModelSerializer with working HyperlinkedIdentityField, but no hyperlinked relations  
						
						
						
					 
					
						2012-10-04 11:26:41 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							a366d6e612 
							
						 
					 
					
						
						
							
							M2M fields supported  
						
						
						
					 
					
						2012-10-03 16:08:20 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							09f2267601 
							
						 
					 
					
						
						
							
							Improve comments  
						
						
						
					 
					
						2012-10-03 15:39:03 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							27c93c08d2 
							
						 
					 
					
						
						
							
							Fix for empty form fields  
						
						
						
					 
					
						2012-10-03 12:56:01 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							f4ad77ac04 
							
						 
					 
					
						
						
							
							Fix for empty form fields  
						
						
						
					 
					
						2012-10-03 12:55:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							58c1263267 
							
						 
					 
					
						
						
							
							Use either PrimaryKeyRelatedField or ManyPrimaryKeyRelatedField as appropriate (fixes test)  
						
						
						
					 
					
						2012-10-03 12:16:30 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							cab3b2f3f8 
							
						 
					 
					
						
						
							
							Split out PrimaryKeyRelatedField and ManyPrimaryKeyRelatedField  
						
						
						
					 
					
						2012-10-03 12:07:34 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b99f350a 
							
						 
					 
					
						
						
							
							Added model form field -> serializer form field mapping  
						
						
						
					 
					
						2012-10-02 16:16:49 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							b16fb57771 
							
						 
					 
					
						
						
							
							Expand pagination support, add docs  
						
						
						
					 
					
						2012-10-01 15:49:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							6fa589fefd 
							
						 
					 
					
						
						
							
							Pagination support  
						
						
						
					 
					
						2012-09-30 17:31:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							e0913e29b8 
							
						 
					 
					
						
						
							
							Fix some bits of serialization  
						
						
						
					 
					
						2012-09-25 13:20:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tom Christie 
							
						 
					 
					
						
						
						
						
							
						
						
							4b691c4027 
							
						 
					 
					
						
						
							
							Change package name: djangorestframework -> rest_framework  
						
						
						
					 
					
						2012-09-20 13:06:27 +01:00