encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-18 15:47:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,826 Commits 18 Branches 132 Tags 105 MiB
d3dd45b3f4
Commit Graph

8826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Buehl
34887ed756 it's safe to import scope and constants 2014-03-06 20:21:44 +00:00
Eric Buehl
86375f2d95 Merge remote-tracking branch 'upstream/master' 2014-03-06 20:21:27 +00:00
Xavier Ordoquy
51e6982397 Fixed the validation for optional fields that have a value. 2014-03-06 21:18:37 +01:00
Xavier Ordoquy
caf4d36cb3 More complex test case. 2014-03-06 21:17:41 +01:00
Xavier Ordoquy
de899824b8 Forgot to add the ref field to the field list. 2014-03-06 16:43:30 +01:00
Xavier Ordoquy
9e291879d1 Added an optional unique field to Album and checked that duplicates are detected. 2014-03-06 15:24:07 +01:00
Tom Christie
ef94861c2d It's 2014 now, dontchaknow 2014-03-06 09:25:18 +00:00
Tom Christie
c1148241ee Version 2.3.13 2014-03-06 09:01:05 +00:00
Tom Christie
ab05689393 Merge pull request #1454 from rhcarvalho/patch-2 
Fix typo
 2014-03-05 17:55:52 +00:00
Eric Buehl
e0682e9298 don't implicitly import provider.oauth2 2014-03-05 17:15:52 +00:00
Rodolfo Carvalho
94fe03779b Fix typo 2014-03-05 17:01:54 +01:00
Tom Christie
45ae5081f7 Merge pull request #1453 from davidbgk/patch-2 
Update documentation of render methods (obj to data)
 2014-03-04 16:24:18 +00:00
David Larlet
84e7bf6796 Update documentation of render methods (obj to data) 2014-03-04 17:21:07 +01:00
Tom Christie
71ea5b73ce Merge pull request #1452 from davidbgk/patch-1 
Typo in keywords arguments name
 2014-03-04 15:33:41 +00:00
David Larlet
07cb436d61 Typo in keywords arguments name 
Because it matters ;)
 2014-03-04 16:32:34 +01:00
Tom Christie
4edd39b2e4 Merge pull request #1442 from Anton-Shutik/master 
RelatedField default value handling fixed
 2014-03-04 15:26:34 +00:00
Anton Shutik
dea2766aba Added tests for "get_default_value" function 2014-03-04 13:11:54 +03:00
Tom Christie
24a6882232 Merge pull request #1375 from linovia/feature/django_1_7 
Django 1.7 compatibility
 2014-03-03 14:32:38 +00:00
Xavier Ordoquy
3d7cb72e0a Merge remote-tracking branch 'reference/master' into feature/django_1_7 2014-03-03 11:41:07 +01:00
Tom Christie
ee9864e0dc Merge pull request #1448 from zhanghongfei/master 
In the method permission_denied, did not use the request parameter.
 2014-03-02 20:56:29 +00:00
Tom Christie
b93e3a060a Merge pull request #1447 from kumar303/hawk 
Adds HawkREST to 3rd party docs
 2014-03-02 20:09:52 +00:00
Andreas Pelme
971578ca34 Support for running the test suite with py.test 
* Get rid of runtests.py
 * Moved test code  from rest_framework/tests and rest_framework/runtests to tests
 * Invoke py.test from setup.py
 * Invoke py.test from Travis
 * Invoke py.test from tox
 * Changed setUpClass to be just plain setUp in test_permissions.py
 * Updated contribution guideline to show how to invoke py.test
 2014-03-02 12:40:30 +01:00
hongfeiZhang
693d9d9c63 In the method permission_denied, did not use the request parameter. 2014-03-01 11:37:31 +08:00
Kumar McMillan
c2cd610b15 Adds HawkREST to 3rd party auth docs 2014-02-28 16:52:47 -06:00
Kumar McMillan
a4470c4276 Fix trailing whitespace 
Sorry, my editor does this automatically
 2014-02-28 16:51:32 -06:00
Kumar McMillan
e2857bdcff Fix link to tox 2014-02-28 16:35:03 -06:00
Kumar McMillan
f5f4c1a837 strip trailing whitespace 
my editor does this by default
 2014-02-28 16:34:42 -06:00
Tom Christie
62786a7ad6 Merge pull request #1444 from DanSears/master 
clarified which urls.py to edit
 2014-02-28 16:43:17 +00:00
DanSears
abb240648c clarified which urls.py to edit 2014-02-28 08:40:45 -08:00
Tom Christie
22f225175f Merge pull request #1437 from Keats/master 
Display the media type of the API response on the browsable API
 2014-02-28 11:55:45 +00:00
Tom Christie
22576013b9 Merge pull request #1443 from silent1mezzo/patch-1 
Update Travis to test Django 1.6.2
 2014-02-28 11:55:05 +00:00
Anton Shutik
3c62f0efc3 RelatedField.get_default_value: return empty list if self.many==True 2014-02-28 13:59:21 +03:00
Tom Christie
c3c69f4304 Merge pull request #1441 from dustinfarris/null-serialization 
TestCases and POST/PUT'ing serialized data that contains `None`
 2014-02-28 09:27:27 +00:00
Tom Christie
1a75e7b02b Merge pull request #1440 from un33k/master 
handle zero and negative available_requests
 2014-02-28 09:18:03 +00:00
Val Neekman
818b4bf8b3 handle negative time value and prevent a divide by zero 2014-02-27 12:27:54 -08:00
Dustin Farris
f126856f65 Allow 'None' to pass as a null value in RelatedFields 2014-02-27 12:30:59 -05:00
Adam McKerlie
0620263d24 Update Travis to test Django 1.6.2 
We should be testing the latest version of Django 1.6 as we're doing in the other 1.x releases.
 2014-02-27 11:47:21 -05:00
Anton Shutik
1addd09e2b RelatedField default value handling fixed 2014-02-27 18:34:36 +03:00
Keats
6cd0394e20 Display the media type of the API response on the browsable API 2014-02-26 23:47:35 +00:00
Dustin Farris
505f1173d0 Demonstrate problem post/put'ing serialized data that contains 'None' 2014-02-26 12:08:26 -05:00
Tom Christie
6e92e415aa Merge pull request #1436 from meshy/patch-1 
Minor docs example fix
 2014-02-21 14:24:27 +00:00
Charlie Denton
c3967c08ab Minor docs example fix 
Dates are smaller when they happen before.
 2014-02-21 14:23:33 +00:00
Tom Christie
9841069373 Link to DRF-extensions. Refs #1430 2014-02-20 14:54:17 +00:00
Tom Christie
0a0dad8c60 Merge pull request #1433 from etoccalino/http-signature 
include djangorestframework-httpsignature in the docs
 2014-02-20 08:20:06 +00:00
Elvio Toccalino
1a4c6f075b include djangorestframework-httpsignature in the docs 2014-02-20 01:07:39 -03:00
Tom Christie
316b7b8786 Merge pull request #1428 from theskumar/patch-1 
fix(docs): fix code indentation in serializers.md
 2014-02-18 15:15:18 +00:00
Saurabh Kumar
b3aa512d35 fix(docs): fix code indentation in serializers.md 
It fixes the indentation of `restore_object()` in the section "Specifying which fields should be write-only" serializers documentation.
 2014-02-18 20:39:39 +05:30
Tom Christie
d328f1827d Tweak comment wrapping. 2014-02-18 12:30:55 +00:00
Tom Christie
68573a3c1a Merge pull request #1427 from Ian-Foote/refactor_update 
Refactor UpdateModelMixin.update
 2014-02-18 12:29:50 +00:00
Ian Foote
dca8b98356 Remove unnecessary else 2014-02-18 12:28:02 +00:00