encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 11:33:59 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,770 Commits 18 Branches 132 Tags 105 MiB
dbc5c066c2
Commit Graph

4770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
99a43748eb Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-05 12:46:36 +00:00
Tom Christie
1b8c06aefe Style tweaks in examples 2014-12-05 12:46:08 +00:00
Tom Christie
de4ef6e394 Merge pull request #2195 from tomchristie/tomchristie-escape-u2028-u2029-json 
Escape \u2028 and \u2029 in JSON output.
 2014-12-05 12:35:24 +00:00
Tom Christie
e2b3908834 Fix quickstart tutorial 2014-12-05 09:44:01 +00:00
Carlton Gibson
e65428783e Merge pull request #2209 from linovia/bugfix/tutorial_1 
Bugfix/tutorial 1
 2014-12-05 09:20:45 +01:00
BrickXu
d68c614504 Add validation for fields & exclude type. 2014-12-05 14:51:39 +08:00
BrickXu
4042180392 Merge pull request #3 from tomchristie/master 
Merge upstream
 2014-12-05 13:30:56 +08:00
Tymur Maryokhin
d9930181ee Removed unused imports, pep8 fixes, typo fixes 2014-12-05 00:29:28 +01:00
Xavier Ordoquy
9d078be59c Fix the tutorial against the v3.0 2014-12-04 23:34:55 +01:00
Xavier Ordoquy
38e05e66c9 print() function works from Python 2.6 to 3.X 2014-12-04 23:22:00 +01:00
Tymur Maryokhin
45dc44b203 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2014-12-04 20:57:27 +01:00
Tymur Maryokhin
001884a192 Removed unused compat code 2014-12-04 16:06:43 +01:00
Tymur Maryokhin
95af92ca01 Removed custom urlparse compat 2014-12-04 15:47:42 +01:00
Carlton Gibson
6ee361332b Add missing definite article 2014-12-04 14:15:01 +01:00
phalt
fcbae5d99f updates based on suggestions 2014-12-04 11:20:33 +00:00
Carlton Gibson
71e1a3942e Initial link from Serializers to Validators 2014-12-04 12:15:14 +01:00
Carlton Gibson
b8f396bce8 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2014-12-04 11:59:52 +01:00
Tom Christie
e8cbf41bd9 Merge pull request #2172 from kchange/master 
Added missing default style for FileField
 2014-12-04 07:47:53 +00:00
Tymur Maryokhin
d54c67d79d Removed custom StringIO, force_text, smart_text compat 2014-12-04 03:11:42 +01:00
Tymur Maryokhin
09e59f2686 Removed custom python_2_unicode_compatible. Closes #2183 2014-12-04 02:50:25 +01:00
Tymur Maryokhin
f8fdfe5a93 Updated Django versions to match requirements 2014-12-04 00:03:08 +01:00
Tom Christie
f221b737a1 Merge pull request #2197 from mtschammer/mtschammer-validated_attrs-rename 
Renamed validated_attrs to validated_data to be more in line with other code
 2014-12-03 23:01:30 +00:00
Kevin Brown
66bce38b59 Merge pull request #2196 from tomchristie/tomchristie-improve-update-nested-validation 
Improve checks for nested creates and updates.
 2014-12-03 17:57:47 -05:00
Martin Tschammer
ab25d706c7 Renamed validated_attrs to validated_data to be more in line with other similar code. 2014-12-03 23:52:35 +01:00
Tom Christie
e1d98f7756 Improve nested update and create testing. 2014-12-03 22:45:44 +00:00
Tom Christie
f2dd05a6e6 Improved nested update test in update(). 
Closes #2194.
 2014-12-03 22:43:40 +00:00
Tom Christie
23fa6e54ce Escape \u2028 and \u2029 in JSON output. 
Closes #2169.
 2014-12-03 22:33:34 +00:00
Tom Christie
5f2f54b7fb Merge pull request #2188 from eiriksm/patch-2 
Update build status icon on github pages page.
 2014-12-03 13:01:19 +00:00
eiriksm
74a9ece3dc Update build status icon on github pages page. 2014-12-03 13:37:56 +01:00
Mark Hughes
55528addf9 Added test to show potential issue with UniqueValidator being added to the underlying Django model. 2014-12-03 12:30:15 +00:00
Tom Christie
c5a2d501e5 Merge pull request #2175 from BrickXu/fix_2171 
Not allow to pass an empty actions to viewset.as_view()
 2014-12-03 08:53:04 +00:00
Tom Christie
71a8cb2282 Merge pull request #2185 from eiriksm/patch-1 
Use svg version of travis build status badge
 2014-12-03 08:49:25 +00:00
eiriksm
9397a653a4 Use svg version of travis build status badge 2014-12-03 09:22:42 +01:00
phalt
a17d5d2b0b remove unsused link 2014-12-02 16:11:43 +00:00
Tom Christie
95d57e6dac Merge pull request #2182 from sh4r3m4n/master 
Updated serializers documentation
 2014-12-02 15:27:06 +00:00
Matías Lang
5ad22aea60 Updated serializers documentation 
There was an error in the docs: the field extra_field_kwargs of the serializer's Meta doesn't work. The field must be extra_kwargs instead.
 2014-12-02 12:23:25 -03:00
Tom Christie
2123685453 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-02 15:15:33 +00:00
Tom Christie
33096a1de6 BindingDict inherits from collections.MutableMapping. Closes #2135. 2014-12-02 15:15:21 +00:00
Tom Christie
e335ad4a04 Merge pull request #2181 from daaray/patch-2 
Fix typo in serializers doc
 2014-12-02 14:48:49 +00:00
David Ray
84cff98fbf fix typo 2014-12-02 09:46:43 -05:00
Tom Christie
0359e9250d FileUploadParser. Raising StopFutureHandlers removes any handlers not yet run for the active set. Closes #2109. 2014-12-02 13:52:46 +00:00
Tom Christie
e30e3f6dfc Update README with 3.0 info. 2014-12-02 13:14:11 +00:00
Tom Christie
41045c1c23 Merge branch 'gregmuellegger-fixes/2013' 2014-12-02 13:05:09 +00:00
Tom Christie
76ac641fbd Minor tweaks for helpful message on Model.objects.create() failure. 2014-12-02 13:04:49 +00:00
Tom Christie
54b7b32818 Merge branch 'fixes/2013' of git://github.com/gregmuellegger/django-rest-framework into gregmuellegger-fixes/2013 2014-12-02 12:46:47 +00:00
phalt
515060a6ab Only show pip install for httpie 2014-12-02 10:16:41 +00:00
Tom Christie
79e18a2a06 Raise assertion error if calling .save() on a serializer with errors. Closes #2098. 2014-12-02 09:27:40 +00:00
Tom Christie
6ac79b8223 Document Field.fail(). Closes #2147. 2014-12-02 09:19:59 +00:00
BrickXu
53f52765fc Not allow to pass an empty actions to viewset.as_view(). Refs issue #2171 2014-12-02 17:07:55 +08:00
Tom Christie
f4fc4670ca Promote 'many_init' to public API. Closes #2152. 2014-12-02 08:53:36 +00:00