Commits · d8a95b4b6d4480089d38808b45a7b47f30e81cdd · edx / django-rest-framework · GitLab

23 Dec, 2013 6 commits
- Back out permissions example change in favor of easier to follow example · d8a95b4b
  Tom Christie committed Dec 23, 2013
  
  d8a95b4b Browse Files
- Merge pull request #1315 from amatellanes/master · c3857236
```
Simplified some examples in tutorial
```
  Tom Christie committed Dec 23, 2013
  c3857236 Browse Files
- Simplified some examples in tutorial · 2846ddb5
  amatellanes committed Dec 23, 2013
  
  2846ddb5 Browse Files
- Merge remote-tracking branch 'upstream/master' · 67a2b5a8
  amatellanes committed Dec 23, 2013
  
  67a2b5a8 Browse Files
- Revert "Simplified some examples in tutorial" · 74f1cf63
```
This reverts commit d6806340.
```
  amatellanes committed Dec 23, 2013
  74f1cf63 Browse Files
- Simplified some examples in tutorial · d6806340
  amatellanes committed Dec 23, 2013
  
  d6806340 Browse Files
22 Dec, 2013 2 commits
- Merge pull request #1312 from amatellanes/master · 9b7341e4
```
Simplified some functions in permissions.py
```
  Tom Christie committed Dec 22, 2013
  9b7341e4 Browse Files
- Simplified some functions · 2d6d725c
  amatellanes committed Dec 22, 2013
  
  2d6d725c Browse Files
21 Dec, 2013 7 commits
- Merge pull request #1309 from lukaszb/errors-for-renamed-fields · b7482629
```
Should it be that way?
```
  Tom Christie committed Dec 21, 2013
  b7482629 Browse Files
- Additional test for 'source' behaviour. Refs #1302 · 71ab7cda
  Tom Christie committed Dec 21, 2013
  
  71ab7cda Browse Files
- Less brittle through relationship testing. Closes #1292. · a439c80c
  Tom Christie committed Dec 21, 2013
  
  a439c80c Browse Files
- Added example of using APIException class. Closes #1300 · bc0e9947
  Tom Christie committed Dec 21, 2013
  
  bc0e9947 Browse Files
- Docs tweaks · 1f3ded45
  Tom Christie committed Dec 21, 2013
  
  1f3ded45 Browse Files
- Merge pull request #1310 from vbabiy/adding-djangorestframework-camel-case-to-docs · e6fac635
```
djangorestframework-camel-case in docs
```
  Tom Christie committed Dec 21, 2013
  e6fac635 Browse Files
- Added links to djangorestframework-camel-case in the third party · 22343ee1
```
sections of the docs for both parsers and renderers.
```
  Vitaly Babiy committed Dec 21, 2013
  22343ee1 Browse Files
20 Dec, 2013 5 commits
- Should it be that way? · 973f898a
  Lukasz Balcerzak committed Dec 20, 2013
  
  973f898a Browse Files
- Merge pull request #1308 from lukaszb/missing-custom-validation-method-test · 46906b2b
```
Added missing custom validation method test
```
  Tom Christie committed Dec 20, 2013
  46906b2b Browse Files
- Added missing custom validation method test · 71aa5f3c
  Lukasz Balcerzak committed Dec 20, 2013
  
  71aa5f3c Browse Files
- Merge pull request #1307 from lukaszb/test-class-name-duplicated · c66b0f88
```
Updated test class name to be unique
```
  Tom Christie committed Dec 20, 2013
  c66b0f88 Browse Files
- Updated test class name to be unique · 0e3822d6
  Lukasz Balcerzak committed Dec 20, 2013
  
  0e3822d6 Browse Files
17 Dec, 2013 3 commits
- Add note on compat import in tutorial · 02ae1682
  Tom Christie committed Dec 17, 2013
  
  02ae1682 Browse Files
- Merge pull request #1301 from linovia/bugfix/tutorial_for_python3 · 7bdb1b2e
```
Fix tutorial's step 1 for Python 3
```
  Tom Christie committed Dec 17, 2013
  7bdb1b2e Browse Files
- Use the BytesIO for buffering bytes and import the one from the compat module. · 80264804
  Xavier Ordoquy committed Dec 17, 2013
  
  80264804 Browse Files
16 Dec, 2013 8 commits
- Merge branch 'nullbooleanfield_testcase' of… · 88940198
```
Merge branch 'nullbooleanfield_testcase' of git://github.com/dpetzel/django-rest-framework into dpetzel-nullbooleanfield_testcase

Conflicts:
	rest_framework/tests/test_serializer.py
```
  Tom Christie committed Dec 16, 2013
  88940198 Browse Files
- Merge pull request #1184 from dpetzel/nullbooleanfield_fix · 0f372602
```
Fix infered field type for models.NullBooleanField
```
  Tom Christie committed Dec 16, 2013
  0f372602 Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 4f58263c
  Tom Christie committed Dec 16, 2013
  
  4f58263c Browse Files
- Add CONTRIBUTING.md · f0f7a91b
  Tom Christie committed Dec 16, 2013
  
  f0f7a91b Browse Files
- Typo · 31dd1602
  Tom Christie committed Dec 16, 2013
  
  31dd1602 Browse Files
- Merge pull request #1298 from craigds/fix-nested-serializers-with-renamed-fields · 4bc829d4
```
Fix nested serializers with renamed fields
```
  Tom Christie committed Dec 16, 2013
  4bc829d4 Browse Files
- Don't import compat.py from authtoken.models. Closes #1297 · fc2dee84
  Tom Christie committed Dec 16, 2013
  
  fc2dee84 Browse Files
- Fix expansion of writable nested serializers where the inner fields have source set. · 4a134eef
  Craig de Stigter committed Dec 16, 2013
  
  4a134eef Browse Files
14 Dec, 2013 2 commits
- Update django-oauth-plus version · 69fef838
  Tom Christie committed Dec 14, 2013
  
  69fef838 Browse Files
- Add note on pagination bugfix. Closes #1293. · 6b6b2556
  Tom Christie committed Dec 14, 2013
  
  6b6b2556 Browse Files
13 Dec, 2013 7 commits
- Added @philipforget for work on #1232. Thanks :) · f78b3187
  Tom Christie committed Dec 13, 2013
  
  f78b3187 Browse Files
- Updated release notes · 54d3c6a7
  Tom Christie committed Dec 13, 2013
  
  54d3c6a7 Browse Files
- Compat fixes for django-oauth-plus versions 2.0-2.2.1 · a87c55a9
  Tom Christie committed Dec 13, 2013
  
  a87c55a9 Browse Files
- Merge branch 'master' of git://github.com/philipforget/django-rest-framework… · fac6d1a3
```
Merge branch 'master' of git://github.com/philipforget/django-rest-framework into philipforget-master
```
  Tom Christie committed Dec 13, 2013
  fac6d1a3 Browse Files
- Links to drf-nested-routers · 39dbea4d
  Tom Christie committed Dec 13, 2013
  
  39dbea4d Browse Files
- Add notes on lookup_prefix argument and why it's there even though unused by the… · 193af483
```
Add notes on lookup_prefix argument and why it's there even though unused by the default implementations.
```
  Tom Christie committed Dec 13, 2013
  193af483 Browse Files
- Merge pull request #1281 from alanjds/router-prefix-patch · fbaba0a3
```
'lookup_prefix' on SimpleRouter.get_lookup_regex, easing code de-duplication
```
  Tom Christie committed Dec 13, 2013
  fbaba0a3 Browse Files