aboutsummaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)Author
2014-07-26Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: rest_framework/fields.py
2014-07-22Merge pull request #1692 from davbo/patch-1Tom Christie
Update fields.md
2014-07-20Add link to drf-extra-fields. Closes #1698Tom Christie
2014-07-18Phrasing tweakTom Christie
2014-07-18TypoTom Christie
2014-07-18Beef up the kickstarter announcementTom Christie
2014-07-17Docs for kickstarter announcementTom Christie
2014-07-17Kickstarter note on front pageTom Christie
2014-07-17Update fields.mdDave King
obj.__class__ will return the actual Class object, we want to serialise a string (accessed with obj.__class__.__name__)
2014-07-15Fusion adsTom Christie
2014-07-09Updated quick start project set up orderEmmanouil
2014-07-07Docs on object level permissions and filters. Closes #1683Tom Christie
2014-07-01Docs tweakTom Christie
2014-06-26Fixes #1651. Add link to drf-extensions nested routers to docsChibisov Gennady
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-12Fix accidental docs changeTom Christie
2014-06-12Version 2.3.14Tom Christie
2014-06-10Fix #1614 - Corrected reference to serializers.CharFieldGreg Barker
2014-06-02Fix typo in docsRodolfo Carvalho
2014-05-29Note on configuring TokenAuthenticationTom Christie
2014-05-26Add the allow_add_remove parameter to the get_serializer methodkhamaileon
2014-05-20Merge pull request #1536 from Ian-Foote/choicefield_blank_display_valueTom Christie
Allow customising ChoiceField blank display value
2014-05-20Document ChoiceField blank_display_value parameterIan Foote
2014-05-15Typo fix.Giorgos Logiotatidis
2014-05-06Replaced singular "is" by plural "are"Sylvain Bellemare
2014-05-06Removed unnecessary "that"Sylvain Bellemare
2014-05-06Added missing "the" wordSylvain Bellemare
2014-05-05Removed superfluous "./"sSylvain Bellemare
2014-05-05Added missing "the" wordSylvain Bellemare
2014-05-05Added missing "to" wordSylvain Bellemare
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-30Merge pull request #1391 from kaygorodov/masterXavier Ordoquy
Turning off pagination
2014-04-28typoLaurent Bristiel
2014-04-28very minor typo in code exampledpetzel
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-10Document new UnicodeYAMLRendererMiro Hrončok
2014-04-08Fix python syntax in filtering docsCraig
2014-04-07replace page with page_size to avoide confusionDmitry Mukhin
2014-03-17Minor docs tweakTom Christie
2014-03-17Tweak DRF compound fields docsTom Christie
2014-03-16Serializer fields section for 3rd-party packagesSteven Cummings
* Add new section to serializer fields page where we can list and link 3rd-party packages that provide more field types * Add an entry for drf-compound-fields
2014-03-06Add SEARCH_PARAM and ORDERING_PARAM to settingsPeter Inglesby
Fixes #1434