aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-12-13Merge branch 'master' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py
2013-12-13Expanded notes in quickstart. Closes #1127. Closes #1128.Tom Christie
2013-12-13Clean up implementationTom Christie
2013-12-13Merge pull request #1234 from linovia/bugfix/nested_models_without_related_nameTom Christie
Fixed the nested model serializers in case of the related_name isn’t set...
2013-12-13Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
Conflicts: docs/api-guide/routers.md
2013-12-13Merge pull request #1289 from sheppard/wqdb-routerTom Christie
third-party package: wq.db
2013-12-12third-party package: wq.dbS. Andrew Sheppard
2013-12-13Further docs tweaksTom Christie
2013-12-13Allow NUM_PROXIES=0 and include more docsTom Christie
2013-12-12Merge pull request #1273 from kahnjw/add_get_ident_method_to_base_throttleTom Christie
Add get_ident method to base throttle class
2013-12-12Add third party packagesTom Christie
2013-12-11Merge pull request #1283 from OddBloke/masterTom Christie
Add required imports to Generating Tokens example, and update with get_user_model()
2013-12-11Use get_user_model instead of User in Generating Tokens exampleOddBloke
Because that's a better way of doing it.
2013-12-11Add full required imports to Generating Tokens exampleOddBloke
Previously we were missing User and post_save.
2013-12-11Merge pull request #1282 from daaray/patch-1Tom Christie
Update routers.md
2013-12-10Update routers.mdDavid Ray
Reference to ```DefaultRouter``` should be ```SimpleRouter```
2013-12-10SimpleRouter.get_lookup_regex got lookup_prefixAlan Justino
This allows @alanjds/drf-nested-routers to not duplicate/monkeypatch work made here
2013-12-10Merge pull request #1280 from tomchristie/fix-1205Tom Christie
Refine model manager behavior so as not to use the behavior in incorrect...
2013-12-10Remove incorrect apostropheTom Christie
2013-12-10Update release notesTom Christie
2013-12-10Refine model manager behavior so as not to use the behavior in incorrect ↵Tom Christie
cases. Closes #1205
2013-12-10Tweak REST condition text.Tom Christie
2013-12-10Merge pull request #1278 from caxap/masterTom Christie
Added REST Condition to 3rd party permissions packages list.
2013-12-09Added REST Condition to 3rd party permissions packages list.Maxim Kamenkov
2013-12-09Merge pull request #1277 from Ian-Foote/masterTom Christie
Fix typo "Not" -> "Note"
2013-12-09Fix typo "Not" -> "Note"Ian
2013-12-09Update release notesTom Christie
2013-12-09Fix compat issues for #1231Tom Christie
2013-12-09Merge branch 'issue-1231-jsonencoder' of ↵Tom Christie
git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-09Add notes to contributing docsTom Christie
2013-12-08Merge pull request #1262 from tomchristie/fix-1261Tom Christie
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
2013-12-08Merge pull request #1275 from qooleot/masterTom Christie
RelatedField is function of serializer class
2013-12-09Merge masterTom Christie
2013-12-08Merge pull request #1276 from lalkaka/masterTom Christie
Minor grammar fix -- 'team' is singular
2013-12-09Drop unneeded assertTom Christie
2013-12-09Catch and mask ParseErrors that occur during rendering of the BrowsableAPI.Tom Christie
2013-12-08Minor grammar fix -- 'team' is singularRustam Lalkaka
2013-12-08RelatedField is function of serializer classtaras
2013-12-07Merge pull request #1274 from wilsaj/patch-1Tom Christie
docfix: update installation example to work with django 1.6
2013-12-06update installation example to work with django 1.6Andy Wilson
looks like django.conf.urls.defaults was deprecated as of django 1.6
2013-12-06PEP8 Compliancekahnjw
2013-12-06Add missing tick markskahnjw
2013-12-06Fix typokahnjw
2013-12-06Add documentation to explain what effect these changes have.kahnjw
2013-12-06Add get_ident method to pass new tests.kahnjw
2013-12-06Add tests to pass for get_ident method in BaseThrottle class.kahnjw
2013-12-06Version 2.3.102.3.10Tom Christie