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

23 May, 2013 1 commit
- simplified, moved field humanizing to Field. broken tests · a1deb5ea
  Oscar Vilaplana committed May 23, 2013
  
  a1deb5ea Browse Files
19 May, 2013 24 commits
- removed TODO · dea0b6ab
  Oscar Vilaplana committed May 19, 2013
  
  dea0b6ab Browse Files
- removed TODO · 259153b3
  Oscar Vilaplana committed May 19, 2013
  
  259153b3 Browse Files
- removed TODO · 9133ef77
  Oscar Vilaplana committed May 19, 2013
  
  9133ef77 Browse Files
- fixed tests, added docs, renamed helper method · 7a5cd090
  Oscar Vilaplana committed May 19, 2013
  
  7a5cd090 Browse Files
- fixed merge conflict · 6bbedfd7
  Oscar Vilaplana committed May 19, 2013
  
  6bbedfd7 Browse Files
- * make test assertion more explicit · 31893cff
```
* cleanup
```
  Nikolaus Schlemm committed May 19, 2013
  31893cff Browse Files
- Added min_length and max_length · e80488b6
  Oscar Vilaplana committed May 19, 2013
  
  e80488b6 Browse Files
- Removed unused imports · edbf65c0
  Oscar Vilaplana committed May 19, 2013
  
  edbf65c0 Browse Files
- s/Single Character/String/ · 696c053f
  Oscar Vilaplana committed May 19, 2013
  
  696c053f Browse Files
- Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into… · 88c94f37
```
Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options
```
  Nikolaus Schlemm committed May 19, 2013
  88c94f37 Browse Files
- Added tests, cleaned up imports · f1f5f92d
  Oscar Vilaplana committed May 19, 2013
  
  f1f5f92d Browse Files
- use double quotes for docstring instead of single quotes · efca5f6f
  Nikolaus Schlemm committed May 19, 2013
  
  efca5f6f Browse Files
- Merge branch 'issue-192-expose-fields-for-options' of… · 400fd6be
```
Merge branch 'issue-192-expose-fields-for-options' of github.com:grimborg/django-rest-framework into issue-192-expose-fields-for-options
```
  Oscar Vilaplana committed May 19, 2013
  400fd6be Browse Files
- Merge pull request #2 from nschlemm/issue-192-expose-fields-for-options · 2a004545
```
Issue 192 expose fields for options
```
  Òscar Vilaplana committed May 19, 2013
  2a004545 Browse Files
- FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for… · b07cfdcf
```
FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate
```
  Nikolaus Schlemm committed May 19, 2013
  b07cfdcf Browse Files
- Merge branch 'issue-192-expose-fields-for-options' of… · 19f838f6
```
Merge branch 'issue-192-expose-fields-for-options' of github.com:nschlemm/django-rest-framework into issue-192-expose-fields-for-options
```
  Oscar Vilaplana committed May 19, 2013
  19f838f6 Browse Files
- Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into… · 5473f601
```
Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options
```
  Nikolaus Schlemm committed May 19, 2013
  5473f601 Browse Files
- don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate · 1154c12b
  Nikolaus Schlemm committed May 19, 2013
  
  1154c12b Browse Files
- WORKAROUND: avoid errors like "AttributeError: 'APIRoot' object has no attribute 'get_serializer'" · a91841f7
  Nikolaus Schlemm committed May 19, 2013
  
  a91841f7 Browse Files
- Disabled label and help_text in unit test. We should change the test so · 08e9e204
```
that it sets them up.
```
  Oscar Vilaplana committed May 19, 2013
  08e9e204 Browse Files
- Made field label optional in OPTIONS · b915c1d4
  Oscar Vilaplana committed May 19, 2013
  
  b915c1d4 Browse Files
- Merge pull request #1 from nschlemm/issue-192-expose-fields-for-options · 42b61ffc
```
Merged work in progress for Issue 192 expose fields for options
```
  Òscar Vilaplana committed May 19, 2013
  42b61ffc Browse Files
- Integrated status quo of grimborg's awesome humanize_field() for exposing field… · c0f3a1c3
```
Integrated status quo of grimborg's awesome humanize_field() for exposing field metadata via OPTIONS :)
```
  Nikolaus Schlemm committed May 19, 2013
  c0f3a1c3 Browse Files
- Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into… · 9454e23a
```
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
```
  Nikolaus Schlemm committed May 19, 2013
  9454e23a Browse Files
18 May, 2013 15 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
- Merge branch 'issue-192-expose-fields-for-options' of… · 843ae602
```
Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options

Conflicts:
	rest_framework/tests/fields.py
```
  Nikolaus Schlemm committed May 18, 2013
  843ae602 Browse Files
- Added @lolek09 for work on #862. Kick ass! · 351814e1
  Tom Christie committed May 18, 2013
  
  351814e1 Browse Files
- added unittests for permission check of exposing actions via OPTIONS · 7f1cc82f
  Nikolaus Schlemm committed May 18, 2013
  
  7f1cc82f Browse Files
- added tests for form · fecadaca
  Oscar Vilaplana committed May 18, 2013
  
  fecadaca 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 humanized field names and types · 4dffcb5d
  Oscar Vilaplana committed May 18, 2013
  
  4dffcb5d 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