encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 21:44:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,820 Commits 18 Branches 132 Tags 105 MiB
01e80ff9f7
Commit Graph

2820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
28ae26466e Py3k fixes. 2013-03-08 22:43:46 +00:00
Tom Christie
0b6267d8cd Added @bitmonkey. Thanks! 
For work on handling errors when deserializing lists of objects.
 2013-03-08 22:28:59 +00:00
Tom Christie
68683b2ea2 Tweak implementation, and use FormSet style errors 2013-03-08 22:19:09 +00:00
Tom Christie
53b58a5059 Merge branch 'master' of https://github.com/bitmonkey/django-rest-framework into list-deserialization 2013-03-08 21:20:52 +00:00
Tom Christie
c5b98f0d10 authtoken abstract if not installed. 
Fixes #705.
 2013-03-08 20:56:30 +00:00
Tom Christie
4d48de631b Docs on per-object filtering 2013-03-08 20:41:00 +00:00
Tom Christie
1016c14a8a Added @dulaccc. 
For the awesome OAuth 2 support in #693.
 2013-03-08 20:26:10 +00:00
Tom Christie
650d8e6a8e More bits of cleanup 2013-03-08 20:23:25 +00:00
Marc Tamlyn
332c99748f Add some simple numQueries tests. 2013-03-08 17:36:43 +00:00
Marc Tamlyn
a91dca178d Correcy typo. 2013-03-08 17:01:43 +00:00
Tom Christie
5fffaf89e2 Merge pull request #711 from toranb/master 
GenericAPIView now applies filter_backend for list and retrieve api views
 2013-03-08 08:15:56 -08:00
toran billups
1a8f07def8 GenericAPIView now applies filter_backend for list and retrieve api views 
Before this commit only the MultipleObjectAPIView would apply a
filter_backend, leaving the SingleObjectAPIView to return objects you
might otherwise expect to have been filtered out.

It's worth mentioning that when a SingleObjectAPIView makes a request
for an object that should be excluded, a 404 is the expected result.
 2013-03-08 10:08:53 -06:00
Ian Dash
66605acaf0 Errors during deserializing lists now return a list of tuples with 
index of bad item in data plus usual errors dict
 2013-03-08 15:08:05 +00:00
Tom Christie
e42e49852d Tweak docs 2013-03-07 19:49:36 +00:00
Tom Christie
c2eb27629c Update docs for OAuth 2.0 2013-03-07 17:50:48 +00:00
Tom Christie
a4b33992a5 Merge OAuth2 work. 2013-03-07 17:43:13 +00:00
Tom Christie
1d62594fa9 Clean ups. 2013-03-07 15:44:36 +00:00
Tom Christie
44930f3091 Fix Py3k syntax errors 2013-03-07 09:15:05 +00:00
Tom Christie
4e80541824 Version 2.2.3 2013-03-07 09:05:13 +00:00
Tom Christie
ad336cc636 Fix broken None value for TimeField. 
Refs #707.
 2013-03-07 09:03:53 +00:00
Tom Christie
d4e3610e71 Merge & clean OAuth support 2013-03-07 09:01:53 +00:00
Tom Christie
f5a8f172a3 Merge pull request #708 from kevinastone/master 
Fixed DateField with Empty Values (Fixes #707)
 2013-03-07 01:01:07 -08:00
Kevin Stone
2f8d8b499e Patched DateField and DateTimeField to check for None values before trying to perform date(time) conversion. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-06 15:16:37 -08:00
Kevin Stone
6bea275de8 Added failing test cases for giving a DateField or DateTimeField a None value to serialize. 
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
 2013-03-06 15:15:19 -08:00
Tom Christie
751064a6fd Merge pull request #706 from markotibold/clean-install 
Prevent warning: no files found matching '*.txt' under directory
 2013-03-06 14:33:31 -08:00
Pierre Dulac
5a56f92abf Update the package dependency url style in tox.ini 2013-03-06 22:42:36 +01:00
Pierre Dulac
8845c0be88 Fix import errors 2013-03-06 22:42:09 +01:00
Marko Tibold
1037888505 Prevent warning: no files found matching '*.txt' under directory 
'rest_framework/templates' (there are only .html files in the templates
directory).
 2013-03-06 21:16:40 +01:00
Pierre Dulac
30e3775b8b Update the documentation 
with a warning for incompatibility with Python 3
and taking @tomchristie advice into account on how to reformulate some
sentences
 2013-03-06 19:16:57 +01:00
Pierre Dulac
cda21a306e Only add the django-oauth2-provider apps if the module is installed 
otherwise log a warning
 2013-03-06 19:16:13 +01:00
Pierre Dulac
6f5764105b Use the PyPI django-oauth2-provider version 2013-03-06 19:15:33 +01:00
Tom Christie
ddd7125a63 Tweak travis badge positioning. 2013-03-06 13:35:04 +00:00
Tom Christie
cdf7c778d8 Version 2.2.2 2013-03-06 12:29:56 +00:00
Tom Christie
5422eedd0a Add tox note. 2013-03-06 12:29:32 +00:00
Tom Christie
6135df56c6 Merge pull request #703 from tomchristie/datetime-formats 
Datetime formats
 2013-03-06 04:25:35 -08:00
Tom Christie
d260f1ec15 Add tox note. 2013-03-06 12:19:49 +00:00
Tom Christie
1106596c80 Clean ups to datetime formatting 2013-03-06 12:19:39 +00:00
Tom Christie
4f7b028a0a Updating docs 2013-03-05 20:57:35 +00:00
Tom Christie
c20ebe95f6 Merge datetime formats 2013-03-05 17:50:28 +00:00
Stephan Groß
17e0ff0fcd Add @iekadou for #700 support. thanks! 2013-03-05 18:45:09 +01:00
Stephan Groß
7464def4e3 Fix typo 2013-03-05 18:42:31 +01:00
Tom Christie
6e7ddd579b Docs tweak. 2013-03-05 17:39:34 +00:00
Tom Christie
6c2dbf1220 Minor docs tweak 2013-03-05 14:03:28 +00:00
Stephan Groß
d263abbf4d Merge pull request #700 from minddust/migration_fix 
Fix authtoken migration
 2013-03-05 05:52:41 -08:00
Stephan Groß
214e201ff8 Update migration 2013-03-04 17:12:02 +01:00
Stephan Groß
27175c2cf5 Update migration 2013-03-04 17:04:55 +01:00
Stephan Groß
7db2332c40 Update release docs 2013-03-04 14:11:05 +01:00
Stephan Groß
b4c9b68c96 Add note for using authtoken with custom django user model and south 2013-03-04 14:09:59 +01:00
Stephan Groß
d6391359f5 Fix fix migrate authtoken 2013-03-04 14:04:03 +01:00
Stephan Groß
4cdb6b2959 Fix authtoken migration 2013-03-04 13:53:39 +01:00