Commits · 0e80a535fb617ffb64f948f53cc1831249487f1a · edx / django-rest-framework · GitLab

21 May, 2013 7 commits
- Tweak nav style slightly · 0e80a535
  Tom Christie committed May 21, 2013
  
  0e80a535 Browse Files
- Added @mikee2185 and @mjtorn for their work on #467. Thank you :) · 6434a5f4
  Tom Christie committed May 21, 2013
  
  6434a5f4 Browse Files
- Note usage of django-filter 0.5.4 for Django 1.3 support. Closes #877 · ac99b814
  Tom Christie committed May 21, 2013
  
  ac99b814 Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 39783a6e
  Tom Christie committed May 21, 2013
  
  39783a6e Browse Files
- Merge and styling fixes · cdc3c374
  Tom Christie committed May 21, 2013
  
  cdc3c374 Browse Files
- Added @atarzwell for docs fix #876. Thanks! · 8bbb94de
  Tom Christie committed May 21, 2013
  
  8bbb94de Browse Files
- Merge pull request #876 from atarzwell/master · f77ae156
```
Incorrect import in Tutorial - Step 6 - ViewSets
```
  Tom Christie committed May 21, 2013
  f77ae156 Browse Files
20 May, 2013 13 commits
- Update Typo · 62c7326b
  Andrew Tarzwell committed May 20, 2013
  
  62c7326b Browse Files
- content type may be set explicitly on the response · aef7ac72
  Tom Christie committed May 20, 2013
  
  aef7ac72 Browse Files
- Fix charset issues · f19e0d54
  Tom Christie committed May 20, 2013
  
  f19e0d54 Browse Files
- Typo · 6fcffcc9
  Tom Christie committed May 20, 2013
  
  6fcffcc9 Browse Files
- Fix broken docs links. Closes #873 · 26e037d4
  Tom Christie committed May 20, 2013
  
  26e037d4 Browse Files
- Added @commonorgarden, for fix #875. Thank you :) · 3aad1222
  Tom Christie committed May 20, 2013
  
  3aad1222 Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 656a1361
  Tom Christie committed May 20, 2013
  
  656a1361 Browse Files
- More explicit quickstart guide. Closes #867. · bc8671d7
  Tom Christie committed May 20, 2013
  
  bc8671d7 Browse Files
- Merge pull request #875 from commonorgarden/master · 9f455fbc
```
Issue 874 - Update SlugField to raise validation errors for invalid slugs
```
  Tom Christie committed May 20, 2013
  9f455fbc Browse Files
- Updated SlugField to raise validation errors for invalid slugs · c3fd7c66
  David Jones committed May 20, 2013
  
  c3fd7c66 Browse Files
- Merge pull request #872 from Neamar/master · ee543e46
```
Removed typo from documentation
```
  Tom Christie committed May 20, 2013
  ee543e46 Browse Files
- Legacy parameter order · 4c85829c
  Neamar committed May 20, 2013
  
  4c85829c Browse Files
- Corrected docs (authentication instead of filtering) · 42a8fe89
  Neamar committed May 20, 2013
  
  42a8fe89 Browse Files
18 May, 2013 20 commits
- Only use object permissions in browsable api form generation if an object exists · 7c945b43
  Tom Christie committed May 18, 2013
  
  7c945b43 Browse Files
- Enforce object permissions check when rendering forms in browseable API · 48021777
  Tom Christie committed May 18, 2013
  
  48021777 Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 5ed3f59a
  Tom Christie committed May 18, 2013
  
  5ed3f59a Browse Files
- Fix broken 'binary content' in browseable API · 4631b91e
  Tom Christie committed May 18, 2013
  
  4631b91e Browse Files
- Added @lolek09 for work on #862. Kick ass! · 351814e1
  Tom Christie committed May 18, 2013
  
  351814e1 Browse Files
- Correct charset on UnicodeJSONRenderer · d4721fc1
  Tom Christie committed May 18, 2013
  
  d4721fc1 Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · bac4bf6e
  Tom Christie committed May 18, 2013
  
  bac4bf6e Browse Files
- Added proper charset support · 0d3d66cb
  Tom Christie committed May 18, 2013
  
  0d3d66cb Browse Files
- Added @matteosuppo for work on #865. Thanks! · 6af61a19
  Tom Christie committed May 18, 2013
  
  6af61a19 Browse Files
- Merge pull request #865 from ryankask/issue-747-lazy-strings-serialized · 1888f4a1
```
Issue 747 lazy strings serialized
```
  Tom Christie committed May 18, 2013
  1888f4a1 Browse Files
- Move function to compat. · 579f77ce
  Ryan Kaskel committed May 18, 2013
  
  579f77ce Browse Files
- Merge pull request #864 from minddust/fix_missing_min_values · 6d5cf527
```
Fix missing min values
```
  Tom Christie committed May 18, 2013
  6d5cf527 Browse Files
- Merge pull request #863 from pyriku/787-unicodejsonrenderer · c7fd2435
```
Adds UnicodeJSONRenderer
```
  Tom Christie committed May 18, 2013
  c7fd2435 Browse Files
- Drop another case of u'', this time from #530 code · 99848b03
  Markus Törnqvist committed May 18, 2013
  
  99848b03 Browse Files
- Drop u'', it was used inconsistently and breaks for nothing with Python 3.2 · 1fd66fe8
  Markus Törnqvist committed May 18, 2013
  
  1fd66fe8 Browse Files
- Merge latest changes from master. · 33f702d3
  Ryan Kaskel committed May 18, 2013
  
  33f702d3 Browse Files
- Handle Python 3 strings and lazy strings. · 10e451a8
  Ryan Kaskel committed May 18, 2013
  
  10e451a8 Browse Files
- Fix order for applying min_value to fields · 025c40e7
  Stephan Groß committed May 18, 2013
  
  025c40e7 Browse Files
- Merge branch 'master' into mjtorn-master · 48c1b223
```
Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py

Fixed conflicts
```
  Markus Törnqvist committed May 18, 2013
  48c1b223 Browse Files
- Tests proper encoding in JSONRenderer and UnicodeJSONRenderer · b9b22976
  Pablo Recio committed May 18, 2013
  
  b9b22976 Browse Files