encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 13:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,641 Commits 18 Branches 132 Tags 105 MiB
611919aa0a
Commit Graph

2641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
a18d3df0f6 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-04-03 09:21:04 +01:00
Tom Christie
74fbd5ccc5 Fix bug with inactive user accessing OAuth 2013-04-03 09:20:36 +01:00
J. Paul Reed
889558365b Don't have the ModelSerializer trust deserialized objects to not have redefine bool()ean-ness. 
If the model we're using the ModelSerializer for has redefined methods that act as a boolean (__bool__ or __len__), it may not return the object even though it is_valid(), and should.
 2013-04-02 01:41:40 -07:00
Tom Christie
5ed7032427 Merge pull request #771 from glic3rinu/master 
Fixed IPv6 support for urlize_quoted_links template tag
 2013-04-01 14:06:21 -07:00
glic3rinu
76d1c47905 Fixed IPv6 support for urlize_quoted_links 2013-04-01 20:15:05 +02:00
Tom Christie
7d7c03eb24 Added @vshih for docs fixes in #769. Thanks! 2013-04-01 17:09:36 +02:00
Tom Christie
64bcbb34d4 Merge pull request #769 from vshih/master 
Spelling/grammar fixes.
 2013-03-31 05:34:13 -07:00
Tom Christie
ec076a0078 Add viewsets/routers to indexs etc 2013-03-31 11:36:58 +01:00
Victor Shih
33ce7dfac4 Spelling/grammar fixes. 2013-03-30 20:28:27 -07:00
Tom Christie
97aa023916 Updating tutorial 2013-03-30 17:22:52 +00:00
Tom Christie
e9092e1420 Initial API documentation 2013-03-30 16:54:22 +00:00
Tom Christie
b4945f476c Merge branch 'master' into resources-routers 2013-03-30 15:41:38 +00:00
Tom Christie
399ac70b83 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-03-30 15:40:11 +00:00
Tom Christie
c4eda3a653 Tweak strapline 2013-03-30 15:39:25 +00:00
Tom Christie
2e06f5c832 Fix typo 2013-03-29 17:26:58 +00:00
Tom Christie
89f3c1f8c4 Update release-notes.md 2013-03-29 13:44:50 +00:00
Tom Christie
a69262a1cd Merge pull request #767 from tomchristie/fix-oauth2-token-only 
Fix OAuth 2 token only
 2013-03-29 06:42:24 -07:00
Tom Christie
ff3ebd979d Merge pull request #766 from glic3rinu/master 
Refactored urlize_quoted_links based on Dango 1.5 urlize
 2013-03-29 06:40:23 -07:00
Tom Christie
2169c34a6f Merge pull request #768 from kevinastone/master 
Fixeds DjangoFilterBackend Incompatibility with SingleObjectMixin
 2013-03-29 06:36:46 -07:00
Kevin Stone
4531ded061 Removed pagination regression special case for Django<1.4. Having DjangoFilterBackend return an actual query set fixes this issue. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-28 18:48:48 -07:00
Tom Christie
ea33511260 Change strapline 2013-03-28 16:02:20 +00:00
Tom Christie
69cbafc64f Add search and next/prev 2013-03-28 15:58:53 +00:00
Tom Christie
d243538547 Note on using curl with token auth 2013-03-28 14:54:42 +00:00
Tom Christie
fb105d138c Minor tweak 2013-03-28 14:54:25 +00:00
glic3rinu
9c32f048b5 Cleaned imports on templatetags/rest_framework module 2013-03-28 12:01:47 +01:00
glic3rinu
3774ba3ed2 Added force_text to compat 2013-03-28 12:01:08 +01:00
Kevin Stone
d4df617f8c Added unit test for failing DjangoFilterBackend on SingleObjectMixin that was resolved in b10663e024 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-27 18:29:50 -07:00
Kevin Stone
b10663e024 Fixed DjangoFilterBackend not returning a query set. 
Fixed bug unveiled in #682.

Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-27 17:55:36 -07:00
Pierre Dulac
fa61b2b2f1 Remove oauth2-provider backends reference from compat.py 2013-03-28 01:05:51 +01:00
Pierre Dulac
8ec60a22e1 Remove client credentials from all OAuth 2 tests 2013-03-28 00:57:23 +01:00
Fernando Rocha
b2cea84fae Complete remove of client checks from oauth2 
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
 2013-03-27 19:00:36 -03:00
glic3rinu
2c0363ddae Added quotes to TRAILING_PUNCTUATION used by urlize_quoted_links 2013-03-27 22:58:11 +01:00
glic3rinu
5f48b4a77e Refactored urlize_quoted_links code, now based on Django 1.5 urlize 2013-03-27 22:43:41 +01:00
Fernando Rocha
f1b8fee4f1 client credentials should be optional (fix #759) 
client credentials should only be required on token
request

Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
 2013-03-27 14:05:46 -03:00
Tom Christie
9b56616750 Merge 2013-03-26 08:59:40 +00:00
Tom Christie
92c929094c Version 2.2.5 2013-03-26 07:48:53 +00:00
Tom Christie
8387cb5d16 Docs fix 2013-03-25 20:28:17 +00:00
Tom Christie
7eefcf7e53 Bulk update, allow_add_remove flag 2013-03-25 20:26:34 +00:00
Tom Christie
f82db5521e Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-03-25 17:30:32 +00:00
Tom Christie
dca24cd914 Added @stoneg for typo fix #754. Thank you! 2013-03-25 16:44:36 +00:00
Tom Christie
4840eb27d7 Merge pull request #754 from stoneG/master 
Just a tiny typo
 2013-03-25 09:29:51 -07:00
Sitong Peng
dab158e1fd Tiny typo 2013-03-25 09:27:12 -07:00
Tom Christie
6111dcef52 Update release notes 2013-03-22 22:58:04 +00:00
Tom Christie
9fdb661c59 Merge pull request #749 from tomchristie/clean-basic-nested-serialization 
Clean basic nested serialization
 2013-03-22 15:29:59 -07:00
Tom Christie
addf7e9b36 Defer the writable nested modelserializers work 2013-03-22 22:27:03 +00:00
Tom Christie
9cdf841169 Tweaking 2013-03-22 22:11:30 +00:00
Tom Christie
fe82982ff2 Merge master 2013-03-22 22:09:49 +00:00
Tom Christie
624ce250cd Updating contribution docs (still wip) 2013-03-22 22:06:38 +00:00
Tom Christie
9bf7c9b714 Merge master 2013-03-22 21:57:37 +00:00
Tom Christie
870d5c7d78 Merge pull request #744 from tomchristie/basic-bulk-edit 
Basic bulk create and bulk update
 2013-03-22 14:47:29 -07:00