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

18 May, 2013 40 commits
- Adding a class attribute into JSONRenderer for ensuring ascii, and using it consistently · c69f9600
  Pablo Recio committed May 18, 2013
  
  c69f9600 Browse Files
- Merge pull request #861 from minddust/fix_missing_field_values · 3f47eb7a
```
Remove default values - django sets them for us - cause of #710
```
  Tom Christie committed May 18, 2013
  3f47eb7a Browse Files
- Fix missing para.. · 6714b755
  Stephan Groß committed May 18, 2013
  
  6714b755 Browse Files
- Add newline · aeea3203
  Stephan Groß committed May 18, 2013
  
  aeea3203 Browse Files
- Rename has_user_through_model -> has_through_model · 5f8d353f
  Tom Christie committed May 18, 2013
  
  5f8d353f Browse Files
- Add TestCases for default field values · 9f9cb97d
  Stephan Groß committed May 18, 2013
  
  9f9cb97d Browse Files
- Merge pull request #854 from ryankask/issue-775 · e1a3cab4
```
All relations pointing to ManyToManyFields should default to read-only
```
  Tom Christie committed May 18, 2013
  e1a3cab4 Browse Files
- Merge pull request #858 from minddust/fix_710 · cc39b9c9
```
Fix for #710
```
  Tom Christie committed May 18, 2013
  cc39b9c9 Browse Files
- Added @andymckay for refactoring #860 · 3ba43b96
  Tom Christie committed May 18, 2013
  
  3ba43b96 Browse Files
- Merge pull request #860 from andymckay/master · e32a6e42
```
startswith can take a tuple
```
  Tom Christie committed May 18, 2013
  e32a6e42 Browse Files
- Merge pull request #857 from pyriku/675-empty-label-related-field · a2e2b0ab
```
Display an empty label into related fields if it isn't required
```
  Tom Christie committed May 18, 2013
  a2e2b0ab Browse Files
- Removed unicode literals · 7dca0e68
  Pablo Recio committed May 18, 2013
  
  7dca0e68 Browse Files
- Merge branch 'master' into 675-empty-label-related-field · 50ba2682
  Pablo Recio committed May 18, 2013
  
  50ba2682 Browse Files
- startswith can take a tuple · aeba5bed
  Andy McKay committed May 18, 2013
  
  aeba5bed Browse Files
- Update getattr · b7176065
  Stephan Groß committed May 18, 2013
  
  b7176065 Browse Files
- Merge pull request #859 from craigds/master · ea9a3d88
```
fix for #765
```
  Tom Christie committed May 18, 2013
  ea9a3d88 Browse Files
- Styling tweaks · 80a26008
  Tom Christie committed May 18, 2013
  
  80a26008 Browse Files
- Merge branch 'master' of https://github.com/mmcardle/django-rest-framework into styling-fixes · 79441373
  Tom Christie committed May 18, 2013
  
  79441373 Browse Files
- Remove unused var · eb9fdd04
  Stephan Groß committed May 18, 2013
  
  eb9fdd04 Browse Files
- Temp commit for branch change ;-) · e6409bbc
  Stephan Groß committed May 18, 2013
  
  e6409bbc Browse Files
- Tweak docs · 2e8ff447
  Tom Christie committed May 18, 2013
  
  2e8ff447 Browse Files
- Merge pull request #856 from grimborg/http_debug_error_page_doc · c8dc5b69
```
added comment about error behavior with DEBUG=True
```
  Tom Christie committed May 18, 2013
  c8dc5b69 Browse Files
- Merge · 304c0768
  Tom Christie committed May 18, 2013
  
  304c0768 Browse Files
- when source='*' on a nested serializer, expand fields into outer serializer when… · 208bd991
```
when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765
```
  Craig de Stigter committed May 18, 2013
  208bd991 Browse Files
- Fix for #710 · a71acc76
  Stephan Groß committed May 18, 2013
  
  a71acc76 Browse Files
- Merge latest changes from master. · 0b84c5a0
  Ryan Kaskel committed May 18, 2013
  
  0b84c5a0 Browse Files
- Added @grimborg and @ryankask. Go Team. :) · 275bfa23
  Tom Christie committed May 18, 2013
  
  275bfa23 Browse Files
- Display an empty label into related fields if it isn't required · 392c8556
  Pablo Recio committed May 18, 2013
  
  392c8556 Browse Files
- added comment about error behavior with DEBUG=True · 4dbf2d90
  Oscar Vilaplana committed May 18, 2013
  
  4dbf2d90 Browse Files
- documentation for https://github.com/tomchristie/django-rest-framework/issues/775 · 72bc5a35
  Mark McArdle committed May 18, 2013
  
  72bc5a35 Browse Files
- Merge branch 'master' of git://github.com/tomchristie/django-rest-framework · 50a8f114
  Mark McArdle committed May 18, 2013
  
  50a8f114 Browse Files
- ToMany fields default to read-only if targeting ManyToManyField. · 770ed3de
  Ryan Kaskel committed May 18, 2013
  
  770ed3de Browse Files
- Initial commit of fix for https://github.com/tomchristie/django-rest-framework/issues/775 · 611919aa
  Mark McArdle committed May 18, 2013
  
  611919aa Browse Files
- Added @craigds, @pyriku, @brianz - Yay for sprints! · a0e3c44c
  Tom Christie committed May 18, 2013
  
  a0e3c44c Browse Files
- Merge pull request #831 from brianz/master · 6d425aa3
```
Allow nested fields to be missing
```
  Tom Christie committed May 18, 2013
  6d425aa3 Browse Files
- Merge pull request #853 from pyriku/725-blank-choice-dash · 0c95405e
```
Adds BLANK_CHOICE_DASH as a choice item
```
  Tom Christie committed May 18, 2013
  0c95405e Browse Files
- Moved test model into closer to the testcase · 8fe43236
  Pablo Recio committed May 18, 2013
  
  8fe43236 Browse Files
- Merge branch 'master' into 725-blank-choice-dash · 53a80044
```
Conflicts:
	rest_framework/tests/fields.py
```
  Pablo Recio committed May 18, 2013
  53a80044 Browse Files
- Adding `BLANK_CHOICE_DASH` as a choice if the model's field isn't required · ab8bd566
  Pablo Recio committed May 18, 2013
  
  ab8bd566 Browse Files
- Merge pull request #851 from linovia/master · 2a3056d0
```
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
```
  Tom Christie committed May 18, 2013
  2a3056d0 Browse Files