Commits · 47ddbc09d9959f1116eabbf67e8d1943f35ffeef · edx / django-rest-framework · GitLab

23 Jan, 2015 14 commits
- Merge pull request #2447 from carltongibson/update-df-references · 47ddbc09
```
Update Django-Filter references
```
  Tom Christie committed Jan 23, 2015
  47ddbc09 Browse Files
- Update Django-Filter references in docs and requirements. · 790c92d4
  Carlton Gibson committed Jan 23, 2015
  
  790c92d4 Browse Files
- Restore DF for Django 1.8 · bf0b331e
  Carlton Gibson committed Jan 23, 2015
  
  bf0b331e Browse Files
- Drop erronous check-in · 4201c9fb
  Tom Christie committed Jan 23, 2015
  
  4201c9fb Browse Files
- Merge pull request #2446 from tomchristie/django-18-alpha · d1fe3f65
```
Support 1.8-alpha.
```
  Tom Christie committed Jan 23, 2015
  d1fe3f65 Browse Files
- Move 1.8-alpha out of 'expected failures' · 04a5f7bf
  Tom Christie committed Jan 23, 2015
  
  04a5f7bf Browse Files
- More sensible response caching. · f3b6eedb
  Tom Christie committed Jan 23, 2015
  
  f3b6eedb Browse Files
- More graceful handling of malformed Content-Disposition · f1ac9d3f
  Tom Christie committed Jan 23, 2015
  
  f1ac9d3f Browse Files
- Add missing skipUnless(django_filters) · 4cb164b6
  Tom Christie committed Jan 23, 2015
  
  4cb164b6 Browse Files
- Fix template loader monkey patching to also support 1.8 · e988d578
  Tom Christie committed Jan 23, 2015
  
  e988d578 Browse Files
- Fix test matrix · e307fd28
  Tom Christie committed Jan 23, 2015
  
  e307fd28 Browse Files
- Drop django-filter from 1.8 · 5eb6949e
  Tom Christie committed Jan 23, 2015
  
  5eb6949e Browse Files
- Work around meta API differences · 25a703b4
  Tom Christie committed Jan 23, 2015
  
  25a703b4 Browse Files
- Merge pull request #2441 from linovia/bugfix/2425 · e56f0a92
```
Support for Django 1.8a1
```
  Tom Christie committed Jan 23, 2015
  e56f0a92 Browse Files
22 Jan, 2015 2 commits
- Merge pull request #2444 from duncm/patch-1 · 0b917141
```
fix link to Django CSRF docs
```
  Tom Christie committed Jan 22, 2015
  0b917141 Browse Files
- fix link to Django CSRF docs · 6e471ad8
  Duncan Maitland committed Jan 22, 2015
  
  6e471ad8 Browse Files
21 Jan, 2015 7 commits
- Owned by import * · 15f797fd
  Xavier Ordoquy committed Jan 21, 2015
  
  15f797fd Browse Files
- Workaround Django issue 24198. · 857185cf
  Xavier Ordoquy committed Jan 21, 2015
  
  857185cf Browse Files
- Use compact traceback for errors reporting. · a7567efa
  Xavier Ordoquy committed Jan 21, 2015
  
  a7567efa Browse Files
- Do not render HTML output for hidden fields. Closes #2410. · 4cf03e30
  Tom Christie committed Jan 21, 2015
  
  4cf03e30 Browse Files
- Make ReturnDict cachable. Closes #2360. · e59b3d17
  Tom Christie committed Jan 21, 2015
  
  e59b3d17 Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · 9d24809a
  Tom Christie committed Jan 21, 2015
  
  9d24809a Browse Files
- Allow missing fields option for inherited serializers. Closes #2388. · da6ef3d0
  Tom Christie committed Jan 21, 2015
  
  da6ef3d0 Browse Files
20 Jan, 2015 2 commits
- Merge pull request #2438 from soooooot/patch-1 · c0fa92e9
```
correcting unclosed quote in docs routers.md 
```
  José Padilla committed Jan 20, 2015
  c0fa92e9 Browse Files
- correcting unclosed quote in routers.md · 3ca8f85a
```
correcting unclosed quote in routers.md
```
  soooooot committed Jan 20, 2015
  3ca8f85a Browse Files
19 Jan, 2015 11 commits
- Merge pull request #2437 from erictheise/patch-2 · e39d8410
```
correcting "it's" to "its" in Tutorial 1
```
  José Padilla committed Jan 19, 2015
  e39d8410 Browse Files
- correcting "it's" to "its" in Tutorial 1 · b0bc79ed
  Eric Theise committed Jan 19, 2015
  
  b0bc79ed Browse Files
- Merge branch 'master' of https://github.com/tomchristie/django-rest-framework · fdeef89b
  Tom Christie committed Jan 19, 2015
  
  fdeef89b Browse Files
- NotImplemented -> NotImplementedError · 46a3eda0
  Tom Christie committed Jan 19, 2015
  
  46a3eda0 Browse Files
- Merge pull request #2434 from alexsdutton/patch-1 · ae77ff98
```
NotImplemented is not an exception
```
  Tom Christie committed Jan 19, 2015
  ae77ff98 Browse Files
- NotImplemented is not an exception · af05820b
```
`NotImplemented` is a singleton object, not an exception. You should be raising `NotImplementedError` here instead.
```
  Alexander Dutton committed Jan 19, 2015
  af05820b Browse Files
- ReturnDict and ReturnList repr as standard dict/list. Closes #2421. · 0dffc46c
  Tom Christie committed Jan 19, 2015
  
  0dffc46c Browse Files
- Handle UUID objects in JSONEncoder. Closes #2433. · da1db34a
  Tom Christie committed Jan 19, 2015
  
  da1db34a Browse Files
- Merge pull request #2430 from Polyconseil/fbochu/timedelta-json-serialiser-python26-support · b3a0a279
```
Fix timedelta JSON serialization on Python 2.6.
```
  Tom Christie committed Jan 19, 2015
  b3a0a279 Browse Files
- Fix timedelta JSON serialization on Python 2.6. · 5484d570
  Fabien Bochu committed Jan 19, 2015
  
  5484d570 Browse Files
- Merge pull request #2427 from DavidMuller/pytest_version_bumps · 4f27b966
```
Preliminary Support For Django 1.8 Alpha
```
  Xavier Ordoquy committed Jan 19, 2015
  4f27b966 Browse Files
18 Jan, 2015 4 commits
- Save objects before assigning them in InheritedModelSerializationTests; Django… · b5128ca5
```
Save objects before assigning them in InheritedModelSerializationTests; Django 1.8 now throws an error when assigning unsaved objects to Foreign Key, GenericForeignKey, and OneToOneFields
```
  David Muller committed Jan 18, 2015
  b5128ca5 Browse Files
- Add Django 1.8 alpha to test matrix · a82a4d0a
  David Muller committed Jan 18, 2015
  
  a82a4d0a Browse Files
- Bump pytest version in tox.ini to 2.6.4 · 1421b057
  David Muller committed Jan 18, 2015
  
  1421b057 Browse Files
- Bump pytest-django version in tox.ini to 2.8.0 · eb910768
  David Muller committed Jan 18, 2015
  
  eb910768 Browse Files