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

09 Dec, 2013 12 commits
- Merge branch 'issue-1231-jsonencoder' of… · a6ca943f
```
Merge branch 'issue-1231-jsonencoder' of git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder
```
  Tom Christie committed Dec 09, 2013
  a6ca943f Browse Files
- Add notes to contributing docs · c1be5033
  Tom Christie committed Dec 09, 2013
  
  c1be5033 Browse Files
- Add notes to contributing docs · e6f6bb5c
  Tom Christie committed Dec 09, 2013
  
  e6f6bb5c Browse Files
- Add notes to contributing docs · 23369650
  Tom Christie committed Dec 09, 2013
  
  23369650 Browse Files
- Add notes to contributing docs · e80b3530
  Tom Christie committed Dec 09, 2013
  
  e80b3530 Browse Files
- Merge pull request #1262 from tomchristie/fix-1261 · 712ab8e3
```
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
```
  Tom Christie committed Dec 08, 2013
  712ab8e3 Browse Files
- Merge pull request #1275 from qooleot/master · 5eca31d1
```
RelatedField is function of serializer class
```
  Tom Christie committed Dec 08, 2013
  5eca31d1 Browse Files
- Merge master · 80ef2685
  Tom Christie committed Dec 09, 2013
  
  80ef2685 Browse Files
- Merge pull request #1276 from lalkaka/master · 175b4d23
```
Minor grammar fix -- 'team' is singular
```
  Tom Christie committed Dec 08, 2013
  175b4d23 Browse Files
- Drop unneeded assert · 4e9385e7
  Tom Christie committed Dec 09, 2013
  
  4e9385e7 Browse Files
- Catch and mask ParseErrors that occur during rendering of the BrowsableAPI. · 06d8a31e
  Tom Christie committed Dec 09, 2013
  
  06d8a31e Browse Files
- Minor grammar fix -- 'team' is singular · b8732d21
  Rustam Lalkaka committed Dec 08, 2013
  
  b8732d21 Browse Files
08 Dec, 2013 1 commit
- RelatedField is function of serializer class · 3399158d
  taras committed Dec 08, 2013
  
  3399158d Browse Files
07 Dec, 2013 2 commits
- Merge pull request #1274 from wilsaj/patch-1 · 14ae3012
```
docfix: update installation example to work with django 1.6
```
  Tom Christie committed Dec 07, 2013
  14ae3012 Browse Files
- update installation example to work with django 1.6 · db19fba5
```
looks like django.conf.urls.defaults was deprecated as of django 1.6
```
  Andy Wilson committed Dec 06, 2013
  db19fba5 Browse Files
06 Dec, 2013 6 commits
- Version 2.3.10 · 910de38a
  Tom Christie committed Dec 06, 2013
  
  910de38a Browse Files
- Update release-notes.md · 85d9eb0f
  Tom Christie committed Dec 06, 2013
  
  85d9eb0f Browse Files
- Added @chuckharmston for kickass bug squashing in #1272 · 51359e46
  Tom Christie committed Dec 06, 2013
  
  51359e46 Browse Files
- Merge pull request #1272 from chuckharmston/1158-partial_relatedfield_null · e05fac68
```
Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158)
```
  Tom Christie committed Dec 06, 2013
  e05fac68 Browse Files
- Raise appropriate error in serializer when making a partial update to set a… · cf6c11bd
```
Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158)
```
  Chuck Harmston committed Dec 06, 2013
  cf6c11bd Browse Files
- Merge pull request #1270 from irrelative/master · e155534f
```
fix setup.py with new __init__.py boilerplate
```
  Tom Christie committed Dec 06, 2013
  e155534f Browse Files
05 Dec, 2013 5 commits
- fix setup.py with new __init__.py boilerplate · 79596dc6
  Justin Davis committed Dec 05, 2013
  
  79596dc6 Browse Files
- Boilerplate cuteness · 1f8069c0
  Tom Christie committed Dec 05, 2013
  
  1f8069c0 Browse Files
- Upgrade JSONP security warning. · f8088bed
  Tom Christie committed Dec 05, 2013
  
  f8088bed Browse Files
- Merge pull request #1269 from infecto/master · b88e5378
```
fix broken documentation links
```
  Tom Christie committed Dec 05, 2013
  b88e5378 Browse Files
- fix broken documentation links · f2682537
  Drew Kowalik committed Dec 04, 2013
  
  f2682537 Browse Files
04 Dec, 2013 4 commits
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 6446b44f
  Tom Christie committed Dec 04, 2013
  
  6446b44f Browse Files
- First pass on contribution guide · de5b9e39
  Tom Christie committed Dec 04, 2013
  
  de5b9e39 Browse Files
- Merge pull request #1267 from tomchristie/fix-1133 · 04a43ddc
```
Clarify wording, fixes #1133.
```
  Tom Christie committed Dec 04, 2013
  04a43ddc Browse Files
- Clarify wording, fixes #1133. · 3c3906e2
  Tom Christie committed Dec 04, 2013
  
  3c3906e2 Browse Files
03 Dec, 2013 10 commits
- Merge pull request #1265 from tomchristie/fix-1196 · 25ac4cd2
```
Remove Content-Type header from empty responses. Fixes #1196
```
  Tom Christie committed Dec 03, 2013
  25ac4cd2 Browse Files
- Remove Content-Type header from empty responses. Fixes #1196 · 38d78b21
  Tom Christie committed Dec 03, 2013
  
  38d78b21 Browse Files
- First pass at a test for ParseErrors breaking the browsable API · 774298f1
  Tom Christie committed Dec 03, 2013
  
  774298f1 Browse Files
- Added @ian-foote, for work on #1250. Thanks! · 9f1918e4
  Tom Christie committed Dec 03, 2013
  
  9f1918e4 Browse Files
- Update release-notes.md · b92c911c
  Tom Christie committed Dec 03, 2013
  
  b92c911c Browse Files
- Merge pull request #1250 from Ian-Foote/choice_field · 344cd865
```
Add choices to options metadata for ChoiceField.
```
  Tom Christie committed Dec 03, 2013
  344cd865 Browse Files
- Catch errors during parsing and set empty .DATA/.FILES before re-raising. · c1d9a96d
  Tom Christie committed Dec 03, 2013
  
  c1d9a96d Browse Files
- Update release-notes.md · fe4c7d40
  Tom Christie committed Dec 03, 2013
  
  fe4c7d40 Browse Files
- Merge pull request #1258 from pyriku/delete-signals-destroy-model-mixin · ac616978
```
Adds pre_delete and post_delete hooks on `DestroyModelMixin`
```
  Tom Christie committed Dec 03, 2013
  ac616978 Browse Files
- Adds pre_delete and post_delete hooks on · 699ec723
  Pablo Recio committed Dec 03, 2013
  
  699ec723 Browse Files