django-rest-framework - Web APIs for Django.

Age	Commit message (Collapse)	Author
2014-08-20	Merge branch 'master' into set-retry-after	Dmitry Mukhin
	Conflicts: tests/test_throttling.py
2014-08-19	Drop six from compat. 1.4.2 is now the lowest supported version.	Tom Christie

2014-08-19	Merge pull request #1778 from linovia/bugfix/1398	Tom Christie
	Bugfix/1398
2014-08-19	Remove duplicated model declaration.	Xavier Ordoquy

2014-08-19	Resolve linting issues	Tom Christie

2014-08-19	Code linting and added runtests.py	Tom Christie

2014-08-19	Merged #1398 against 2.4 branch.	Xavier Ordoquy

2014-08-19	Merge master	Tom Christie

2014-07-26	Merge remote-tracking branch 'origin/master' into 2.4.0	Xavier Ordoquy
	Conflicts: rest_framework/fields.py
2014-06-23	Merge remote-tracking branch 'origin/master' into 2.4.0	Xavier Ordoquy
	Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini
2014-05-01	Use urls functions from django instead of compat.	Xavier Ordoquy

2014-05-01	Merge remote-tracking branch 'reference/2.4.0' into feature/pytest	Xavier Ordoquy
	Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini
2014-04-30	Merge remote-tracking branch 'reference/master' into feature/pytest	Xavier Ordoquy
	Conflicts: tests/test_serializer.py
2014-04-17	Merge remote-tracking branch 'pelme/pytest' into feature/pytest	Xavier Ordoquy
	Conflicts: .travis.yml rest_framework/runtests/runtests.py tests/test_filters.py tests/test_pagination.py tox.ini
2014-03-02	Support for running the test suite with py.test	Andreas Pelme
	* Get rid of runtests.py * Moved test code from rest_framework/tests and rest_framework/runtests to tests * Invoke py.test from setup.py * Invoke py.test from Travis * Invoke py.test from tox * Changed setUpClass to be just plain setUp in test_permissions.py * Updated contribution guideline to show how to invoke py.test