1. 03 Nov, 2012 1 commit
  2. 02 Nov, 2012 12 commits
  3. 01 Nov, 2012 15 commits
  4. 31 Oct, 2012 7 commits
  5. 30 Oct, 2012 5 commits
    • using 'pk' in fields throws KeyError · a3ace366
      add missing imports
      Browsable API seems to be working fine with FBV's (2.0.0)
      removing snippets from the URI doesn't make sense
      remain consistent in using SnippetDetail
      Pavel Savchenko committed
    • Package and doc tweaks · 166025c0
      Tom Christie committed
    • Merge branch 'restframework2' into rest-framework-2-merge · 9b30dab4
      Conflicts:
      	.gitignore
      	.travis.yml
      	AUTHORS
      	README.rst
      	djangorestframework/mixins.py
      	djangorestframework/renderers.py
      	djangorestframework/resources.py
      	djangorestframework/serializer.py
      	djangorestframework/templates/djangorestframework/base.html
      	djangorestframework/templates/djangorestframework/login.html
      	djangorestframework/templatetags/add_query_param.py
      	djangorestframework/tests/accept.py
      	djangorestframework/tests/authentication.py
      	djangorestframework/tests/content.py
      	djangorestframework/tests/reverse.py
      	djangorestframework/tests/serializer.py
      	djangorestframework/views.py
      	docs/examples.rst
      	docs/examples/blogpost.rst
      	docs/examples/modelviews.rst
      	docs/examples/objectstore.rst
      	docs/examples/permissions.rst
      	docs/examples/pygments.rst
      	docs/examples/views.rst
      	docs/howto/alternativeframeworks.rst
      	docs/howto/mixin.rst
      	docs/howto/reverse.rst
      	docs/howto/usingurllib2.rst
      	docs/index.rst
      	docs/topics/release-notes.md
      	examples/sandbox/views.py
      	rest_framework/__init__.py
      	rest_framework/compat.py
      	rest_framework/utils/breadcrumbs.py
      	setup.py
      Tom Christie committed