| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2014-12-12 | Fix dependancies | Tom Christie | |
| 2014-12-12 | Merge master | Tom Christie | |
| 2014-12-03 | Merge | Tom Christie | |
| 2014-12-04 | Updated Django versions to match requirements | Tymur Maryokhin | |
| 2014-11-29 | Remove YAML support from core | José Padilla | |
| 2014-11-28 | Merge branch 'version-3.1' into oauth_as_package | José Padilla | |
| Conflicts: requirements-test.txt rest_framework/compat.py tests/settings.py tox.ini | |||
| 2014-11-27 | Update to latest minor Django versions | José Padilla | |
| 2014-11-25 | Merge branch 'master' of https://github.com/tomchristie/django-rest-framework | Tom Christie | |
| 2014-11-25 | Add markdown and PyYAML to tox test requirements | José Padilla | |
| 2014-11-25 | Add a docs build to the Tox run | Dougal Matthews | |
| 2014-11-25 | Removed dots in Django versions in tox. Refs #2124. | Tymur Maryokhin | |
| 2014-11-25 | Added python 3.2 to test against django master . Related to #2075. | Tymur Maryokhin | |
| 2014-11-25 | Streamlined tox config with 1.8 features | Tymur Maryokhin | |
| 2014-11-17 | Add django master to build matrix. Closes #2075. | Tom Christie | |
| 2014-10-31 | Merge branch 'master' into version-3.0 | Tom Christie | |
| 2014-10-28 | Use PYTHONDONTWRITEBYTECODE=1 on tox environment | José Padilla | |
| This fixes bad marshal data errors after running tests with tox and later running tests manually via runtests.py. Fixes #1957 | |||
| 2014-09-26 | FileField and ImageField | Tom Christie | |
| 2014-09-05 | Removes OAuth dependencies from tox configurations | Jharrod LaFon | |
| 2014-09-03 | Test with released Django 1.7 | José Padilla | |
| 2014-08-19 | Add flake8 to requirements | Tom Christie | |
| 2014-08-19 | Code linting and added runtests.py | Tom Christie | |
| 2014-08-19 | Merge master | Tom Christie | |
| 2014-07-28 | Updated the tox file. | Xavier Ordoquy | |
| 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-16 | Typo in the Python version. | Xavier Ordoquy | |
| 2014-05-16 | Updated tox with Python 2.4 | 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-30 | Merge remote-tracking branch 'origin/master' into 2.4.0 | Xavier Ordoquy | |
| Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py | |||
| 2014-04-27 | Updated Django's versions. | Xavier Ordoquy | |
| 2014-04-17 | Upgraded to pytest-django 2.6.1 | Xavier Ordoquy | |
| 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-04-13 | Merge remote-tracking branch 'origin/master' into 2.4.0 | Xavier Ordoquy | |
| Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini | |||
| 2014-03-23 | Aligned the django-filter version with travis builds. | Xavier Ordoquy | |
| 2014-03-21 | Bumped tests against Django from 1.7a2 to 1.7b1 | Xavier Ordoquy | |
| 2014-03-07 | Add Django 1.7 to tox | Tom Christie | |
| 2014-03-07 | Pin pillow to 2.3.0 | Tom Christie | |
| 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 | |||
| 2013-12-23 | Merge branch 'bennbollay-patch-1' into 2.4.0 | Tom Christie | |
| Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini | |||
| 2013-12-13 | Merge branch 'master' into 2.4.0 | Tom Christie | |
| Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py | |||
| 2013-11-15 | update requirements for django-oauth-plus to 2.2.1 | Philip Forget | |
| 2013-11-08 | Updated versions in tox and travis config | Bruno Renié | |
| 2013-09-25 | Drop 1.3 support | Tom Christie | |
| 2013-09-06 | some properly failing tests, set up for standard permissions | bwreilly | |
| 2013-06-05 | Fix up tests and tox | Tom Christie | |
| 2013-06-02 | Add Django 1.6 to docs and to tox | Tom Christie | |
| 2013-03-13 | Use django-filter 0.6a1 and add database query count tests for paginated, ↵ | Tom Christie | |
| filtered lists. | |||
| 2013-03-07 | Merge OAuth2 work. | Tom Christie | |
| 2013-03-07 | Merge & clean OAuth support | Tom Christie | |
| 2013-03-06 | Update the package dependency url style in tox.ini | Pierre Dulac | |
 |
index : django-rest-framework | |
| Web APIs for Django. |
| aboutsummaryrefslogtreecommitdiffstats |