aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics
AgeCommit message (Collapse)Author
2014-08-19Release notesTom Christie
2014-08-19Drop six from compat. 1.4.2 is now the lowest supported version.Tom Christie
2014-08-19Documentation on runtests.pyTom Christie
2014-08-19Merge masterTom Christie
2014-08-18Merge pull request #1641 from javins/login-titleTom Christie
Refactor login template to extend base.
2014-08-18Merge pull request #1654 from carltongibson/1559-take-2Tom Christie
Allow use of native migrations in 1.7 — Take 2
2014-08-18Updated docs for South v1.0Carlton Gibson
2014-08-16Sponsor updateTom Christie
2014-08-15Latest sponsor updateTom Christie
2014-08-15Added compile to the sponsorsTom Christie
2014-08-15Added HolviTom Christie
2014-08-15Latest backer updateTom Christie
2014-08-15Latest sponsor updatesTom Christie
2014-08-14Fixed small typocatherinedodge
2014-08-14Minor sponsor correctionTom Christie
2014-08-14Latest sponsor updateTom Christie
2014-08-13Latest sponsor updateTom Christie
2014-08-12Minor docs style changeTom Christie
2014-08-12Added CantemoTom Christie
2014-08-12Added Rob SpectreTom Christie
2014-08-12Added OpenEye as a silver sponsorTom Christie
2014-08-07Updated links to Bootstrap componentsKevin London
The previous links landed on the the main page and no longer directly linked to specific areas.
2014-08-05Latest sponsor updateTom Christie
2014-08-04Latest sponsor updateTom Christie
2014-08-02Update sponsorshipsTom Christie
2014-08-02Added pathwrightTom Christie
2014-08-02Update Nephila sponsorshipTom Christie
2014-08-02Sponsor updatedTom Christie
2014-08-01Added ProReNata ABTom Christie
2014-08-01Fix LaterPay linkTom Christie
2014-08-01Latest sponsor updatesTom Christie
2014-07-31Kickstarter sponsorsTom Christie
2014-07-31Add platinum sponsorsTom Christie
2014-07-26Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: rest_framework/fields.py
2014-07-17Docs for kickstarter announcementTom Christie
2014-06-24Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559Carlton Gibson
Conflicts: docs/topics/release-notes.md
2014-06-24Added (first pass) notes to docs & release notes. Backed out ↵Carlton Gibson
`SOUTH_MIGRATION_MODULES` setting from `rest_framework.settings`
2014-06-23Merge remote-tracking branch 'origin/master' into 2.4.0Xavier 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-06-13Refactor login template to extend base.Walt Javins
While experimenting with extending DRF, I found that the login page 1) had no title, and 2) duplicated <head> info from base.html. This change adds a new {% block body %} to the base.html template which allows override of the entire html <body>. login_base.html has its duplicated head info stripped, and now extends base.html to share common html <head> templating. As part of this change, pretify.css is unnecessarily added to login_base.html. If this is deemed a problem, it will be easy to block that css out, and have login_base.html override the block. Ideally, I would have liked to create a new api_base.html that extends base.html, move the api specific logic into that template, and leave base.html content agnostic, to truely be a unifying base for all DRF pages. But this change would break current apps that override api.html and expect base.html to be the immediate super template. :/ This change is benificial because it: - removes duplication of header declarations (mostly css includes) - adds a html title to the login page - standardizes html header info across all DRF pages Docs are updated to reflect the new structure.
2014-06-12Version 2.3.14Tom Christie
2014-05-01Updated the release-notes.Xavier Ordoquy
2014-05-01Merge remote-tracking branch 'reference/2.4.0' into feature/pytestXavier Ordoquy
Conflicts: rest_framework/runtests/urls.py tests/test_response.py tox.ini
2014-04-30Merge remote-tracking branch 'reference/master' into feature/pytestXavier Ordoquy
Conflicts: tests/test_serializer.py
2014-04-30Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py
2014-04-24Updated the release notes.Xavier Ordoquy
2014-04-17Merge remote-tracking branch 'pelme/pytest' into feature/pytestXavier Ordoquy
Conflicts: .travis.yml rest_framework/runtests/runtests.py tests/test_filters.py tests/test_pagination.py tox.ini
2014-04-13Merge remote-tracking branch 'origin/master' into 2.4.0Xavier 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-04-07replace page with page_size to avoide confusionDmitry Mukhin
2014-03-06Version 2.3.132.3.13Tom Christie
2014-03-02Support for running the test suite with py.testAndreas 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