Paul Oswald
|
66fa40c300
|
evaluate content at function start
|
2014-07-29 22:13:11 +09:00 |
|
Paul Oswald
|
921e4ed2ee
|
Evaluate content before passing to regex.sub
Issue #1708
|
2014-07-28 16:59:55 +09:00 |
|
Xavier Ordoquy
|
c7a988eb38
|
Merge remote-tracking branch 'reference/master'
|
2014-07-28 07:53:04 +02:00 |
|
Xavier Ordoquy
|
fe048dc4fb
|
Fix #1712 (issue when django-guardian is installed but not configured/used)
|
2014-07-28 07:37:30 +02:00 |
|
Tom Christie
|
02187eb2ed
|
Merge pull request #1705 from opbeat/master
Sending "Bearer" and "Bearer " resulted in a 500.
|
2014-07-26 20:57:28 +01:00 |
|
Ron Cohen
|
e3aff6a567
|
Updated test docstring related to missing bearer token.
|
2014-07-25 13:38:42 +00:00 |
|
Ron Cohen
|
05882cc599
|
Sending "Bearer" and "Bearer " resulted in a 500.
|
2014-07-25 10:55:53 +00:00 |
|
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 |
|