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

3890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
299a8347e8 Merge pull request #1692 from davbo/patch-1 
Update fields.md
 2014-07-22 15:59:04 +02:00
Tom Christie
4797b29ed8 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-07-20 15:47:01 +01:00
Tom Christie
81d15aa9be Add link to drf-extra-fields. Closes #1698 2014-07-20 15:45:45 +01:00
Tom Christie
08772799d4 Update README.md 2014-07-18 13:22:29 +01:00
Tom Christie
bf7371fbc5 Update README.md 2014-07-18 13:21:19 +01:00
Tom Christie
591e67f540 Update README.md 2014-07-18 13:21:03 +01:00
Tom Christie
30bf55bf8d Update README.md 2014-07-18 13:20:55 +01:00
Tom Christie
d059b6d6c3 Change positioning of announcement. 2014-07-18 13:20:03 +01:00
Tom Christie
0782640415 Kickstarter announcement 2014-07-18 13:19:28 +01:00
Tom Christie
4324f50437 Phrasing tweak 2014-07-18 11:54:51 +01:00
Tom Christie
ab34ddcf2f Typo 2014-07-18 11:53:23 +01:00
Tom Christie
550243fd26 Beef up the kickstarter announcement 2014-07-18 11:51:48 +01:00
Tom Christie
ead0e60099 Docs for kickstarter announcement 2014-07-17 17:17:41 +01:00
Tom Christie
6bf0f81b0b Kickstarter note on front page 2014-07-17 13:41:19 +01:00
Dave King
680fabe9dd Update fields.md 
obj.__class__ will return the actual Class object, we want to serialise a string (accessed with obj.__class__.__name__)
 2014-07-17 11:46:59 +01:00
Tom Christie
dd2e950cde Fusion ads 2014-07-15 15:02:09 +01:00
Tom Christie
b519018125 Docs on object level permissions and filters. Closes #1683 2014-07-07 09:51:23 +01:00
Tom Christie
a5e628bf8b Kick travis 2014-07-07 09:42:50 +01:00
Tom Christie
91eabd54bb Docs tweak 2014-07-01 14:34:23 +01:00
Tom Christie
8eadac39ad Merge pull request #1665 from smal/modelserialization-charfield-with-null 
Modelserialization charfield with null
 2014-06-27 16:39:54 +01:00
Serhiy Voyt
3326ddc865 Merge branch 'master' into modelserialization-charfield-with-null 2014-06-27 18:10:50 +03:00
Tom Christie
636ae419be Merge pull request #1661 from chibisov/master 
Fixes #1651. Add link to drf-extensions nested routers to docs
 2014-06-27 14:18:56 +01:00
Chibisov Gennady
c1426d1078 Fixes #1651. Add link to drf-extensions nested routers to docs 2014-06-26 23:29:00 +04:00
Tom Christie
511e874185 Merge pull request #1645 from tankorsmash/patch-1 
tiny typo in the docstring
 2014-06-17 13:37:03 +01:00
TankorSmash
544183f64f typo in the docs 2014-06-16 19:13:02 -04:00
Tom Christie
e11f41ebc4 Merge pull request #1640 from tomchristie/escape-login-logout-paths 
Version 2.3.14
 2014-06-12 12:09:29 +01:00
Tom Christie
82659873c9 Fix accidental docs change 2014-06-12 11:48:58 +01:00
Tom Christie
1386767013 Version 2.3.14 2014-06-12 11:47:26 +01:00
Tom Christie
3dcc6585d2 Merge pull request #1632 from fletchowns/master 
Fix #1614 - Corrected reference to serializers.CharField
 2014-06-11 09:17:12 +01:00
Greg Barker
be84f71bc9 Fix #1614 - Corrected reference to serializers.CharField 2014-06-10 15:20:45 -07:00
Xavier Ordoquy
e8ec81f5e9 Fixed #1624 (thanks @abraithwaite) 2014-06-08 09:03:21 +02:00
Xavier Ordoquy
a3e75e4c6c Merge pull request #1619 from khamaileon/master 
Replace ChoiceField type_label
 2014-06-05 13:08:28 +02:00
khamaileon
08c4594145 Replace ChoiceField type_label 2014-06-05 12:49:02 +02:00
Xavier Ordoquy
0c91d8ed31 Merge pull request #1612 from rhcarvalho/patch-3 
Fix typo in docs
 2014-06-02 11:13:34 +02:00
Rodolfo Carvalho
31f63e1e55 Fix typo in docs 2014-06-02 11:06:03 +02:00
Tom Christie
12394c9cac Merge pull request #1608 from dbrgn/test_client_contenttype 
Always use specified content type in APIRequestFactory
 2014-05-30 19:31:06 +01:00
Danilo Bargen
6cb6bfae1b Always use specified content type in APIRequestFactory 
If `content_type` is specified in the `APIRequestFactory`, always
include it in the request, even if data is empty.
 2014-05-30 17:53:26 +02:00
Tom Christie
a7ff51118f Note on configuring TokenAuthentication 2014-05-29 14:33:16 +01:00
Xavier Ordoquy
add1260be4 Merge pull request #1603 from khamaileon/master 
Add the allow_add_remove parameter to the get_serializer method
 2014-05-26 19:58:55 +02:00
khamaileon
eab5933070 Add the allow_add_remove parameter to the get_serializer method 2014-05-26 18:43:50 +02:00
Tom Christie
708b6a6c06 Merge pull request #1596 from pipermerriam/piper/suport_unicode_model_references 
`_resolve_model` should work with unicode strings
 2014-05-23 09:01:13 +01:00
Piper Merriam
807f7a6bb9 Fix _resolve_model to work with unicode strings 2014-05-22 15:18:51 -06:00
Tom Christie
01e2a34210 Merge pull request #1594 from jcsp/wip-methodfield 
fields: allow help_text on SerializerMethodField
 2014-05-22 17:26:37 +01:00
John Spray
04c820b8e5 fields: allow help_text on SerializerMethodField 
...by passing through any extra *args and **kwargs
to the parent constructor.

Previously one couldn't assign help_text to a
SerializerMethodField during construction.
 2014-05-22 15:24:35 +01:00
Tom Christie
218b94e606 Merge pull request #1536 from Ian-Foote/choicefield_blank_display_value 
Allow customising ChoiceField blank display value
 2014-05-20 16:03:51 +01:00
Ian Foote
1e7b5fd2c0 Document ChoiceField blank_display_value parameter 2014-05-20 14:55:00 +01:00
Xavier Ordoquy
d46d153a99 Merge pull request #1589 from the5fire/fix-pep8 
fix pep8
 2014-05-19 07:38:06 +02:00
allenhu
a1a3ad7639 fix pep8 2014-05-19 09:53:05 +08:00
Xavier Ordoquy
af1ee3e631 Fixed a small change in the 1.7 beta url. 2014-05-18 09:38:46 +02:00
Xavier Ordoquy
a2e1024f8b Updated Django versions. 2014-05-18 09:27:23 +02:00