Commits · 3ddbf92bf99f47827cd7a8b2292f0dadac043cc2 · edx / django-rest-framework · GitLab

13 Nov, 2015 2 commits
- Remove unicode from exception value. · 3ddbf92b
  Dawn Pattison committed Nov 13, 2015
  
  3ddbf92b Browse Files
- Add tests to ensure ListField does not except dictionary as input. · 5fdc4f22
  Dawn Pattison committed Nov 13, 2015
  
  5fdc4f22 Browse Files
20 Oct, 2015 1 commit
- Exclude collections.Mapping from allowable data types in ListField · 8fa7c5c9
  Dawn Pattison committed Oct 20, 2015
  
  8fa7c5c9 Browse Files
16 Oct, 2015 5 commits
- Use set instead of Set · dac1637b
  Dawn Pattison committed Oct 16, 2015
  
  dac1637b Browse Files
- Add tuple and Set to allowed ListField data types · b9316154
  Dawn Pattison committed Oct 16, 2015
  
  b9316154 Browse Files
- Require that data is a list. · f808f08a
  Dawn Pattison committed Oct 16, 2015
  
  f808f08a Browse Files
- Merge pull request #3509 from jpadilla/textfield-max-length · c94b354e
```
Map TextField max_length to CharField
```
  Tom Christie committed Oct 16, 2015
  c94b354e Browse Files
- Map TextField max_length to CharField · a1dad503
  José Padilla committed Oct 16, 2015
  
  a1dad503 Browse Files
15 Oct, 2015 5 commits
- Merge pull request #3502 from auvipy/master · 1b4a41cb
```
removed south migrations
```
  Xavier Ordoquy committed Oct 15, 2015
  1b4a41cb Browse Files
- removed south_migrations directory · 4db25013
  auvipy committed Oct 15, 2015
  
  4db25013 Browse Files
- removed south migrations · 392df946
  auvipy committed Oct 15, 2015
  
  392df946 Browse Files
- Merge pull request #3501 from ztanner/patch-1 · 5570db40
```
Various typo/grammar fixes
```
  Xavier Ordoquy committed Oct 15, 2015
  5570db40 Browse Files
- Various typo fixes · 6fe021ee
  Zack Tanner committed Oct 14, 2015
  
  6fe021ee Browse Files
14 Oct, 2015 2 commits
- Merge pull request #3498 from Ins1ne/feature/admin_renderer_jquery · ad001143
```
fix typo for adding jquery string in AdminRenderer
```
  José Padilla committed Oct 14, 2015
  ad001143 Browse Files
- fix typo for adding jquery string in AdminRenderer · 79008ea2
  Aider Ibragimov committed Oct 14, 2015
  
  79008ea2 Browse Files
12 Oct, 2015 2 commits
- Merge pull request #3488 from demokrates/patch-1 · 68312cb0
```
Update versioning.md
```
  Xavier Ordoquy committed Oct 12, 2015
  68312cb0 Browse Files
- Update versioning.md · 47c9d2a4
```
Changed settings attribute 'VERSION_PARAMETER' --> to 'VERSION_PARAM'.
```
  demokrates committed Oct 12, 2015
  47c9d2a4 Browse Files
09 Oct, 2015 2 commits
- Merge pull request #3485 from dulmandakh/dulmandakh-guardian-check-installed-apps · fa1cfae9
```
Update compat.py
```
  Xavier Ordoquy committed Oct 09, 2015
  fa1cfae9 Browse Files
- Update compat.py · 431ac451
```
try to import guardian if it's in INSTALLED_APPS
```
  Dulmandakh committed Oct 09, 2015
  431ac451 Browse Files
08 Oct, 2015 2 commits
- Merge pull request #3481 from nryoung/fix-codecov · 85cd717e
```
Fix codecov on Travis CI
```
  Tom Christie committed Oct 08, 2015
  85cd717e Browse Files
- Fix codecov on Travis CI · 739d3892
```
The coverage report needs to be explicitly created with arguments passed
in to pytest-cov
```
  Nic Young committed Oct 07, 2015
  739d3892 Browse Files
03 Oct, 2015 1 commit
- Merge pull request #3469 from PhilipGarnero/patch-1 · 6fb96e93
```
Added django-rest-framework-social-oauth2 to list of third party packages
```
  Xavier Ordoquy committed Oct 03, 2015
  6fb96e93 Browse Files
02 Oct, 2015 2 commits
- Added django-rest-framework-social-oauth2 to list of third party packages · 3cdd3c5f
  Philip Garnero committed Oct 02, 2015
  
  3cdd3c5f Browse Files
- Merge pull request #3461 from mcastle/patch-1 · 63662e35
```
Use serializers.ValidationError in AuthTokenSerializer
```
  Tom Christie committed Oct 02, 2015
  63662e35 Browse Files
01 Oct, 2015 3 commits
- Merge pull request #3462 from theengineear/patch-1 · 689afd83
```
Small doc typo `throttles` --> `throttling`
```
  Xavier Ordoquy committed Oct 01, 2015
  689afd83 Browse Files
- Small doc typo `throttles` --> `throttling` · f60c0e99
  Andrew committed Oct 01, 2015
  
  f60c0e99 Browse Files
- Use serializers.ValidationError · 670b0b71
```
Per django rest framework docs, and to prevent confusion with Django's ValidationError, `serializers.ValidationError` is preferred to `exceptions.ValidationError`.
```
  Marlon committed Sep 30, 2015
  670b0b71 Browse Files
30 Sep, 2015 2 commits
- Merge pull request #3459 from rhblind/master · cadbfbab
```
Added drf-haystack to third party resources
```
  Xavier Ordoquy committed Sep 30, 2015
  cadbfbab Browse Files
- Added drf-haystack to third party resources · 0e56b2ea
  Rolf Håvard Blindheim committed Sep 30, 2015
  
  0e56b2ea Browse Files
29 Sep, 2015 2 commits
- Merge pull request #3457 from pombredanne/patch-1 · 71c37762
```
Fixed minor doc typo.
```
  Xavier Ordoquy committed Sep 29, 2015
  71c37762 Browse Files
- Fixed minor doc typo. · 3262ee6c
  Philippe Ombredanne committed Sep 29, 2015
  
  3262ee6c Browse Files
28 Sep, 2015 9 commits
- Merge pull request #3454 from tomchristie/json-field · de5732f3
```
Added JSONField.
```
  Tom Christie committed Sep 28, 2015
  de5732f3 Browse Files
- Handle binary or unicode with JSONField · 265ec8ac
  Tom Christie committed Sep 28, 2015
  
  265ec8ac Browse Files
- Don't attempt to test dicts (unordered) · dad207de
  Tom Christie committed Sep 28, 2015
  
  dad207de Browse Files
- Work around 2.x/3.x json.dumps() return type fuzziness · ec8098b7
  Tom Christie committed Sep 28, 2015
  
  ec8098b7 Browse Files
- Added JSONField. Closes #3170. · 10dbf131
  Tom Christie committed Sep 28, 2015
  
  10dbf131 Browse Files
- Merge pull request #3453 from tomchristie/remove-content-overriding · bae47b7f
```
Remove content overriding
```
  Tom Christie committed Sep 28, 2015
  bae47b7f Browse Files
- Update docs for content overriding · ed677f01
  Tom Christie committed Sep 28, 2015
  
  ed677f01 Browse Files
- More cleanup of browser overrides · c64896c8
  Tom Christie committed Sep 28, 2015
  
  c64896c8 Browse Files
- Merge branch 'master' into remove-content-overriding · d7142e23
  Tom Christie committed Sep 28, 2015
  
  d7142e23 Browse Files