| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2014-11-29 | Moved non-conflicting models | Tymur Maryokhin | |
| 2014-11-29 | Removed unused models | Tymur Maryokhin | |
| 2014-09-18 | get_base_field() refactor | Tom Christie | |
| 2014-08-19 | Remove duplicated model declaration. | Xavier Ordoquy | |
| 2014-08-19 | Merged #1398 against 2.4 branch. | Xavier Ordoquy | |
| 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-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 | |||
 |
index : django-rest-framework | |
| Web APIs for Django. |
| aboutsummaryrefslogtreecommitdiffstats |