diff options
| -rw-r--r-- | AUTHORS | 12 | ||||
| -rw-r--r-- | LICENSE | 9 | ||||
| -rw-r--r-- | examples/urls.py | 10 |
3 files changed, 25 insertions, 6 deletions
@@ -1,8 +1,10 @@ -Project Owner... +AUTHOR: +Tom Christie <tomchristie> - tom@tomchristie.com, @thisneonsoul -Tom Christie <tomchristie> - tom@tomchristie.com - -Thanks to... +CONTRIBUTORS: +Paul Bagwell <pbgwl> - Suggestions & bugfixes. +Marko Tibold <markotibold> - Contributions. +<sebpiq> - Contributions. +THANKS TO: Jesper Noehr <jespern> & the django-piston contributors for providing the starting point for this project. -Paul Bagwell <pbgwl> - Suggestions & bugfixes. diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..272caf49 --- /dev/null +++ b/LICENSE @@ -0,0 +1,9 @@ +Copyright (c) 2011, Tom Christie +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/examples/urls.py b/examples/urls.py index 03894e4e..7cb5e7ce 100644 --- a/examples/urls.py +++ b/examples/urls.py @@ -1,9 +1,9 @@ from django.conf.urls.defaults import patterns, include, url +from django.conf import settings from sandbox.views import Sandbox urlpatterns = patterns('djangorestframework.views', (r'robots.txt', 'deny_robots'), - (r'favicon.ico', 'favicon'), (r'^$', Sandbox.as_view()), @@ -17,3 +17,11 @@ urlpatterns = patterns('djangorestframework.views', (r'^accounts/login/$', 'api_login'), (r'^accounts/logout/$', 'api_logout'), ) + +# Only serve favicon in production because otherwise chrome users will pretty much +# permanantly have the django-rest-framework favicon whenever they navigate to +# 127.0.0.1:8000 or whatever, which gets annoying +if not settings.DEBUG: + urlpatterns += patterns('djangorestframework.views', + (r'favicon.ico', 'favicon'), + ) |