encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 20:27:12 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,529 Commits 18 Branches 132 Tags 104 MiB
a90796c0f0
Commit Graph

3529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
a90796c0f0 Track changes that need noting in 2.4 announcement 2014-01-13 09:56:57 +00:00
Tom Christie
07cff7b37f Merge pull request #1348 from yprez/none-to-empty-string_2.4 
Coerce None to empty string
 2014-01-12 06:52:40 -08:00
Yuri Prezument
cd9a4194ea Check the modelfield's class instead 2014-01-12 16:32:36 +02:00
Yuri Prezument
0fd0454a5c Test for setting allow_none=True for nullable CharFields 2014-01-12 10:53:54 +02:00
Yuri Prezument
e1bbe9d514 Set allow_none = True for CharFields with null=True 2014-01-12 10:53:54 +02:00
Yuri Prezument
6e622d644c CharField - add allow_null argument 2014-01-12 10:53:54 +02:00
Yuri Prezument
e88e3c6ae1 Possible fix for #1330 
Coerce None to '' in CharField.to_native()
 2014-01-12 10:53:54 +02:00
Yuri Prezument
46f5c62530 Regression test for #1330 (Coerce None to '') 2014-01-12 10:53:54 +02:00
Tom Christie
52686420f4 Merge branch 'bennbollay-patch-1' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	rest_framework/compat.py
	tox.ini
 2013-12-23 09:48:59 +00:00
Tom Christie
83b31e7ea2 Merge branch 'patch-1' of git://github.com/bennbollay/django-rest-framework into bennbollay-patch-1 2013-12-23 09:20:59 +00:00
Tom Christie
d8a95b4b6d Back out permissions example change in favor of easier to follow example 2013-12-23 09:12:34 +00:00
Tom Christie
c385723648 Merge pull request #1315 from amatellanes/master 
Simplified some examples in tutorial
 2013-12-23 01:10:13 -08:00
amatellanes
2846ddb5d2 Simplified some examples in tutorial 2013-12-23 09:06:03 +01:00
amatellanes
67a2b5a8cb Merge remote-tracking branch 'upstream/master' 2013-12-23 09:00:28 +01:00
amatellanes
74f1cf6355 Revert "Simplified some examples in tutorial" 
This reverts commit d6806340e5.
 2013-12-23 08:56:34 +01:00
amatellanes
d6806340e5 Simplified some examples in tutorial 2013-12-23 08:50:46 +01:00
bennbollay
e5caf48a12 Change the page title to prioritize page content 
When many tab's are open (which is necessary for DRF's documentation), it becomes impossible to determine which tab contains which pieces of documentation.  That they are all related is obvious by the use of a common icon, just not the specific page each tab is loaded to.

This change inverts the order of the title to maintain as much useful context as possible on the tabbar.
 2013-12-22 16:53:52 -08:00
Tom Christie
9b7341e484 Merge pull request #1312 from amatellanes/master 
Simplified some functions in permissions.py
 2013-12-22 04:53:00 -08:00
amatellanes
2d6d725c2f Simplified some functions 2013-12-22 12:39:47 +01:00
Tom Christie
b7482629c3 Merge pull request #1309 from lukaszb/errors-for-renamed-fields 
Should it be that way?
 2013-12-21 13:58:49 -08:00
Tom Christie
71ab7cda2a Additional test for 'source' behaviour. Refs #1302 2013-12-21 21:54:51 +00:00
Tom Christie
a439c80cd8 Less brittle through relationship testing. Closes #1292. 2013-12-21 21:21:53 +00:00
Tom Christie
bc0e994784 Added example of using APIException class. Closes #1300 2013-12-21 21:10:05 +00:00
Tom Christie
1f3ded4559 Docs tweaks 2013-12-21 17:18:25 +00:00
Tom Christie
e6fac63536 Merge pull request #1310 from vbabiy/adding-djangorestframework-camel-case-to-docs 
djangorestframework-camel-case in docs
 2013-12-21 09:12:50 -08:00
Vitaly Babiy
22343ee117 Added links to djangorestframework-camel-case in the third party 
sections of the docs for both parsers and renderers.
 2013-12-21 07:07:06 -05:00
Lukasz Balcerzak
973f898a4b Should it be that way? 2013-12-20 17:45:56 +01:00
Tom Christie
46906b2bdc Merge pull request #1308 from lukaszb/missing-custom-validation-method-test 
Added missing custom validation method test
 2013-12-20 08:37:30 -08:00
Lukasz Balcerzak
71aa5f3c45 Added missing custom validation method test 2013-12-20 17:16:24 +01:00
Tom Christie
c66b0f8835 Merge pull request #1307 from lukaszb/test-class-name-duplicated 
Updated test class name to be unique
 2013-12-20 08:13:09 -08:00
Lukasz Balcerzak
0e3822d6e0 Updated test class name to be unique 2013-12-20 16:53:06 +01:00
Tom Christie
02ae1682b5 Add note on compat import in tutorial 2013-12-17 09:45:28 +00:00
Tom Christie
7bdb1b2eef Merge pull request #1301 from linovia/bugfix/tutorial_for_python3 
Fix tutorial's step 1 for Python 3
 2013-12-17 01:42:47 -08:00
Xavier Ordoquy
8026480454 Use the BytesIO for buffering bytes and import the one from the compat module. 2013-12-17 10:30:23 +01:00
Tom Christie
8894019899 Merge branch 'nullbooleanfield_testcase' of git://github.com/dpetzel/django-rest-framework into dpetzel-nullbooleanfield_testcase 
Conflicts:
	rest_framework/tests/test_serializer.py
 2013-12-16 13:51:57 +00:00
Tom Christie
0f37260254 Merge pull request #1184 from dpetzel/nullbooleanfield_fix 
Fix infered field type for models.NullBooleanField
 2013-12-16 05:50:10 -08:00
Tom Christie
4f58263cd1 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-12-16 11:59:49 +00:00
Tom Christie
f0f7a91b31 Add CONTRIBUTING.md 2013-12-16 11:59:37 +00:00
Tom Christie
31dd160256 Typo 2013-12-16 11:59:14 +00:00
Tom Christie
4bc829d4e9 Merge pull request #1298 from craigds/fix-nested-serializers-with-renamed-fields 
Fix nested serializers with renamed fields
 2013-12-16 01:18:31 -08:00
Tom Christie
fc2dee844a Don't import compat.py from authtoken.models. Closes #1297 2013-12-16 08:59:10 +00:00
Craig de Stigter
4a134eefa2 Fix expansion of writable nested serializers where the inner fields have source set. 2013-12-16 15:55:54 +13:00
Tom Christie
69fef838cc Update django-oauth-plus version 2013-12-14 21:05:11 +00:00
Tom Christie
6b6b255684 Add note on pagination bugfix. Closes #1293. 2013-12-14 20:42:58 +00:00
Tom Christie
f78b3187df Added @philipforget for work on #1232. Thanks :) 2013-12-13 22:01:19 +00:00
Tom Christie
54d3c6a725 Updated release notes 2013-12-13 21:59:47 +00:00
Tom Christie
a87c55a93a Compat fixes for django-oauth-plus versions 2.0-2.2.1 2013-12-13 21:57:07 +00:00
Tom Christie
fac6d1a36e Merge branch 'master' of git://github.com/philipforget/django-rest-framework into philipforget-master 2013-12-13 20:40:11 +00:00
Tom Christie
39dbea4da4 Links to drf-nested-routers 2013-12-13 20:27:17 +00:00
Tom Christie
193af483ef Add notes on lookup_prefix argument and why it's there even though unused by the default implementations. 2013-12-13 20:22:56 +00:00