aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-08-26Update generic-views.mdNathan Hubbell
2014-08-26Merge pull request #1789 from nemesisdesign/patch-5Carlton Gibson
docs: added drf-hstore to third party fields
2014-08-26Merge pull request #1790 from nemesisdesign/patch-6Carlton Gibson
docs: added HStoreSerializer to third party serializers
2014-08-25Merge remote-tracking branch 'upstream/master' into fix-1719Cezar Pendarovski
Conflicts: rest_framework/templates/rest_framework/base.html
2014-08-25docs: added HStoreSerializer to third party serializersFederico Capoano
added a reference to django-rest-framework-hstore in docs/api-guide/serializers.md
2014-08-25docs: added drf-hstore to third party fieldsFederico Capoano
added a reference to django-rest-framework-hstore in docs/api-guide/fields.md
2014-08-22Made all color declarations in bootstrap-tweaks.css consistentCezar Pendarovski
2014-08-22Fixed the issue with the non-draggable horizontal scrollbarCezar Pendarovski
2014-08-21Add .model deprecation to release notesTom Christie
2014-08-20Frameworks throws AssertionError saying you cannot set required=True and ↵Greg Doermann
read_only=True on editable=False model fields. We should not make the field required if editable=False.
2014-08-20Add Retry-After to release notes. Refs #1508.Tom Christie
2014-08-20Merge pull request #1508 from uploadcare/set-retry-afterTom Christie
set Retry-After header when throttled
2014-08-20TypoTom Christie
2014-08-20Deprecate .model in related routers/permissionsTom Christie
2014-08-20Merge branch 'master' into set-retry-afterDmitry Mukhin
Conflicts: tests/test_throttling.py
2014-08-20Deprecate .model attribute on viewsTom Christie
2014-08-20Fix cache_throttle typoTom Christie
2014-08-20Merge pull request #1770 from tomchristie/2.4.0Tom Christie
2.4.0 Release.
2014-08-20Latest sponsor updateTom Christie
2014-08-20Release notesTom Christie
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 pull request #1778 from linovia/bugfix/1398Tom Christie
Bugfix/1398
2014-08-19Merge pull request #1780 from tomchristie/pytest-tweaksTom Christie
Added `runtests.py` and `flake8` code linting.
2014-08-19Remove duplicated model declaration.Xavier Ordoquy
2014-08-19Resolve python3 linting issueTom Christie
2014-08-19Resolve linting issuesTom Christie
2014-08-19Add flake8 to requirementsTom Christie
2014-08-19Code linting and added runtests.pyTom Christie
2014-08-19Merged #1398 against 2.4 branch.Xavier Ordoquy
2014-08-19Merge masterTom Christie
2014-08-19replace unicode call with force_textPaul Oswald
2014-08-18Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2014-08-18Only set .action attribute in override_method if it already existed on the viewTom Christie
2014-08-18Update README.mdTom Christie
2014-08-18Merge pull request #1763 from fongandrew/patch-1Tom Christie
override_method should substitute action
2014-08-18Merge pull request #1505 from ticosax/test.client.logoutTom Christie
reset stored credentials when call client.logout()
2014-08-18Merge pull request #1641 from javins/login-titleTom Christie
Refactor login template to extend base.
2014-08-18Merge pull request #1726 from ikame/masterTom Christie
Leave status responsibility to parent class
2014-08-18Merge pull request #1654 from carltongibson/1559-take-2Tom Christie
Allow use of native migrations in 1.7 — Take 2
2014-08-18Merge pull request #1772 from tomchristie/fix-1583Tom Christie
Copy filter_backends class attribute before returning it.
2014-08-18Merge pull request #1771 from tomchristie/fix-1718Tom Christie
Always uppercase X-Http-Method-Override methods.
2014-08-18Copy filter_backends class attribute before returning it.Tom Christie
2014-08-18Always uppercase X-Http-Method-Override methods. Closes #1718.Tom Christie
2014-08-18Improve wording.Carlton Gibson
2014-08-18Alter other reference to migrations.Carlton Gibson
2014-08-18Updated docs for South v1.0Carlton Gibson
2014-08-18Merge pull request #1711 from kdazzle/ModelViewSet-queryset-static-propertyTom Christie
Issue #1707: Add documentation to api-docs.viewsets
2014-08-18Merge pull request #1739 from kevinlondon/patch-3Tom Christie
Updated documentation for urls.py