aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-07-18Change positioning of announcement.Tom Christie
2014-07-18Kickstarter announcementTom 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-07Kick travisTom Christie
2014-07-01Docs tweakTom Christie
2014-06-27Merge pull request #1665 from smal/modelserialization-charfield-with-nullTom Christie
Modelserialization charfield with null
2014-06-27Merge branch 'master' into modelserialization-charfield-with-nullSerhiy Voyt
2014-06-27Merge pull request #1661 from chibisov/masterTom Christie
Fixes #1651. Add link to drf-extensions nested routers to docs
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-23Allow use of native migrations in 1.7Carlton Gibson
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-17Merge pull request #1645 from tankorsmash/patch-1Tom Christie
tiny typo in the docstring
2014-06-16typo in the docsTankorSmash
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-12Merge pull request #1640 from tomchristie/escape-login-logout-paths2.3.14Tom Christie
Version 2.3.14
2014-06-12Fix accidental docs changeTom Christie
2014-06-12Version 2.3.14Tom Christie
2014-06-11Merge pull request #1632 from fletchowns/masterTom Christie
Fix #1614 - Corrected reference to serializers.CharField
2014-06-10Fix #1614 - Corrected reference to serializers.CharFieldGreg Barker
2014-06-08Fixed #1624 (thanks @abraithwaite)Xavier Ordoquy
2014-06-05Merge pull request #1619 from khamaileon/masterXavier Ordoquy
Replace ChoiceField type_label
2014-06-05Replace ChoiceField type_labelkhamaileon
2014-06-02Merge pull request #1612 from rhcarvalho/patch-3Xavier Ordoquy
Fix typo in docs
2014-06-02Fix typo in docsRodolfo Carvalho
2014-05-30Merge pull request #1608 from dbrgn/test_client_contenttypeTom Christie
Always use specified content type in APIRequestFactory
2014-05-30Always use specified content type in APIRequestFactoryDanilo Bargen
If `content_type` is specified in the `APIRequestFactory`, always include it in the request, even if data is empty.
2014-05-29Note on configuring TokenAuthenticationTom Christie
2014-05-26Merge pull request #1603 from khamaileon/masterXavier Ordoquy
Add the allow_add_remove parameter to the get_serializer method
2014-05-26Add the allow_add_remove parameter to the get_serializer methodkhamaileon
2014-05-23Merge pull request #1596 from pipermerriam/piper/suport_unicode_model_referencesTom Christie
`_resolve_model` should work with unicode strings
2014-05-22Fix _resolve_model to work with unicode stringsPiper Merriam
2014-05-22Merge pull request #1594 from jcsp/wip-methodfieldTom Christie
fields: allow help_text on SerializerMethodField
2014-05-22fields: allow help_text on SerializerMethodFieldJohn Spray
...by passing through any extra *args and **kwargs to the parent constructor. Previously one couldn't assign help_text to a SerializerMethodField during construction.
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-19Merge pull request #1589 from the5fire/fix-pep8Xavier Ordoquy
fix pep8
2014-05-19fix pep8allenhu
2014-05-18Fixed a small change in the 1.7 beta url.Xavier Ordoquy
2014-05-18Updated Django versions.Xavier Ordoquy
2014-05-16Added missing import.Xavier Ordoquy
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-25 10:09:51 +0000