Merge branch 'restframework2' into rest-framework-2-merge
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
Showing
AUTHORS
deleted
100644 → 0
LICENSE
deleted
100644 → 0
README.md
0 → 100644
README.rst
deleted
100644 → 0
djangorestframework/mixins.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/parsers.py
deleted
100644 → 0
djangorestframework/permissions.py
deleted
100644 → 0
djangorestframework/renderers.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/resources.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/response.py
deleted
100644 → 0
djangorestframework/serializer.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/tests/accept.py
deleted
100644 → 0
djangorestframework/tests/content.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/tests/files.py
deleted
100644 → 0
djangorestframework/tests/methods.py
deleted
100644 → 0
djangorestframework/tests/mixins.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/tests/models.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/tests/package.py
deleted
100644 → 0
djangorestframework/tests/reverse.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
djangorestframework/tests/views.py
deleted
100644 → 0
djangorestframework/urls.py
deleted
100644 → 0
djangorestframework/views.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/api-guide/authentication.md
0 → 100644
docs/api-guide/content-negotiation.md
0 → 100644
docs/api-guide/exceptions.md
0 → 100644
docs/api-guide/fields.md
0 → 100644
docs/api-guide/format-suffixes.md
0 → 100644
docs/api-guide/generic-views.md
0 → 100644
docs/api-guide/pagination.md
0 → 100644
docs/api-guide/parsers.md
0 → 100644
docs/api-guide/permissions.md
0 → 100644
docs/api-guide/renderers.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/api-guide/requests.md
0 → 100644
docs/api-guide/responses.md
0 → 100644
docs/api-guide/reverse.md
0 → 100644
docs/api-guide/serializers.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/api-guide/settings.md
0 → 100644
docs/api-guide/status-codes.md
0 → 100644
docs/api-guide/throttling.md
0 → 100644
docs/api-guide/views.md
0 → 100644
docs/check_sphinx.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/conf.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/contents.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/css/bootstrap-responsive.css
0 → 100755
This diff is collapsed.
Click to expand it.
docs/css/bootstrap.css
0 → 100755
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
docs/css/default.css
0 → 100644
This diff is collapsed.
Click to expand it.
docs/css/prettify.css
0 → 100644
This diff is collapsed.
Click to expand it.
docs/examples.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/examples/blogpost.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/examples/modelviews.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/examples/objectstore.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/examples/permissions.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/examples/pygments.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/examples/sandbox.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/examples/views.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/howto.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/howto/alternativeframeworks.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/howto/mixin.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/howto/reverse.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/howto/setup.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/howto/usingcurl.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/howto/usingurllib2.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/img/favicon.ico
0 → 100644
This diff is collapsed.
Click to expand it.
docs/img/glyphicons-halflings-white.png
0 → 100644
This diff is collapsed.
Click to expand it.
docs/img/glyphicons-halflings.png
0 → 100644
This diff is collapsed.
Click to expand it.
docs/img/grid.png
0 → 100644
This diff is collapsed.
Click to expand it.
docs/img/quickstart.png
0 → 100644
This diff is collapsed.
Click to expand it.
docs/index.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/index.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/js/bootstrap-2.1.1-min.js
0 → 100755
This diff is collapsed.
Click to expand it.
docs/js/jquery-1.8.1-min.js
0 → 100644
This diff is collapsed.
Click to expand it.
docs/js/prettify-1.0.js
0 → 100644
This diff is collapsed.
Click to expand it.
docs/library.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/authentication.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/compat.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/mixins.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/parsers.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/permissions.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/renderers.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/resource.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/response.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/reverse.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/serializer.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/status.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/library/views.rst
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
docs/template.html
0 → 100644
This diff is collapsed.
Click to expand it.
docs/templates/layout.html
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
docs/topics/browsable-api.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/topics/browser-enhancements.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/topics/contributing.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/topics/credits.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/topics/csrf.md
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
docs/topics/rest-framework-2-announcement.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/topics/rest-hypermedia-hateoas.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/tutorial/1-serialization.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/tutorial/2-requests-and-responses.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/tutorial/3-class-based-views.md
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
docs/tutorial/quickstart.md
0 → 100644
This diff is collapsed.
Click to expand it.
examples/.epio-app
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/blogpost/models.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/blogpost/tests.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/blogpost/urls.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/epio.ini
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/manage.py
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
examples/media/objectstore/.keep
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/media/pygments/.keep
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/mixin/urls.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
examples/objectstore/__init__.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/objectstore/urls.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/objectstore/views.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
examples/permissionsexample/urls.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/permissionsexample/views.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/pygments_api/__init__.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/pygments_api/forms.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/pygments_api/models.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/pygments_api/tests.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/pygments_api/urls.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/pygments_api/views.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/requirements-epio.txt
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/requirements.txt
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/resourceexample/__init__.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/resourceexample/forms.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/resourceexample/urls.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/resourceexample/views.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/runtests.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/sandbox/__init__.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/sandbox/views.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/settings.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
examples/urls.py
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
mkdocs.py
0 → 100755
This diff is collapsed.
Click to expand it.
optionals.txt
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/authentication.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
File moved
rest_framework/authtoken/models.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/decorators.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/exceptions.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/fields.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/generics.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/mixins.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/negotiation.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/pagination.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/parsers.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/permissions.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/renderers.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/request.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/response.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/serializers.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/settings.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/tests/decorators.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/tests/files.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/genericrelations.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/generics.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/htmlrenderer.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/tests/models.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/modelviews.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/negotiation.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/pagination.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/tests/request.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/response.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/reverse.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/serializer.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/tests/validators.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/tests/views.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/throttling.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/urlpatterns.py
0 → 100644
This diff is collapsed.
Click to expand it.
rest_framework/urls.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/utils/encoders.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
rest_framework/views.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment