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

18 May, 2013 33 commits
- 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
- 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
- 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
- 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
- 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
- A model's field is required if is null or blank · de5cc8de
  Pablo Recio committed May 18, 2013
  
  de5cc8de Browse Files
- Merge pull request #694 from craigds/master · 9fe6a103
```
fix function names and dotted lookups for use in PrimaryKeyRelatedField
```
  Tom Christie committed May 18, 2013
  9fe6a103 Browse Files
- add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and… · c992b600
```
add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694
```
  Craig de Stigter committed May 18, 2013
  c992b600 Browse Files
- serializers.Field respects ordering on dicts if it exists. Closes #832 · a73c16b8
  Tom Christie committed May 18, 2013
  
  a73c16b8 Browse Files
- add tests for related field source for HyperlinkedRelatedField. #694 · 930bd4d0
  Craig de Stigter committed May 18, 2013
  
  930bd4d0 Browse Files
- add tests for related field source for RelatedField and PrimaryKeyRelatedField. #694 · 0cd7c80e
  Craig de Stigter committed May 18, 2013
  
  0cd7c80e Browse Files
- Updated the dependencies version and added the ALLOWED_HOSTS for tests. · ed0bd195
  Xavier Ordoquy committed May 18, 2013
  
  ed0bd195 Browse Files
- Merge pull request #850 from tomchristie/dynamic-forms · b950b025
```
Forms in Broseable API support dynamic serializers based on request method
```
  Tom Christie committed May 18, 2013
  b950b025 Browse Files
- Forms in Broseable API support dynamic serializers based on request method · aea04016
  Tom Christie committed May 18, 2013
  
  aea04016 Browse Files
- Merge remote-tracking branch 'upstream/master' · c56d5f8f
  Craig de Stigter committed May 18, 2013
  
  c56d5f8f Browse Files
17 May, 2013 6 commits
- Minor mixin refactoring · 34776da9
  Tom Christie committed May 17, 2013
  
  34776da9 Browse Files
- Fix PendingDeprecation warnings in tests · b6fb377c
  Tom Christie committed May 17, 2013
  
  b6fb377c Browse Files
- PendingDeprecation warning to allow_empty · 14ded261
  Tom Christie committed May 17, 2013
  
  14ded261 Browse Files
- Merge pull request #847 from johtso/patch-1 · 2dd48fbb
```
Fix typo + grammar in viewsets docs
```
  Tom Christie committed May 17, 2013
  2dd48fbb Browse Files
- Fix typo + grammar in viewsets docs · df11198c
  Johannes committed May 17, 2013
  
  df11198c Browse Files
- Updated README.md · 646b3b26
  Michael Elovskikh committed May 16, 2013
  
  646b3b26 Browse Files
16 May, 2013 1 commit
- Update release-notes.md · f1fb434e
  Tom Christie committed May 16, 2013
  
  f1fb434e Browse Files