diff options
| author | prathamesh | 2014-12-04 13:17:09 +0530 |
|---|---|---|
| committer | prathamesh | 2014-12-04 13:17:09 +0530 |
| commit | 3f3d272abd98cb090dc47ec284a54519dc49411e (patch) | |
| tree | 58bdcbf9c3edc3164cf6be20214350d4194c08ba | |
| parent | 8c4541b5064993e2ca5fdf7a8ac4ffa76f5548c0 (diff) | |
| parent | 921ec4fdd575d41e065308603c907e8628c0bc18 (diff) | |
| download | certificate-generator-3f3d272abd98cb090dc47ec284a54519dc49411e.tar.gz certificate-generator-3f3d272abd98cb090dc47ec284a54519dc49411e.tar.bz2 certificate-generator-3f3d272abd98cb090dc47ec284a54519dc49411e.zip | |
Merge branch 'master' of https://github.com/FOSSEE/certificate-generator
| -rw-r--r-- | certificate/urls.py | 5 | ||||
| -rw-r--r-- | fossee_project/settings.py | 2 | ||||
| -rw-r--r-- | fossee_project/urls.py | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/certificate/urls.py b/certificate/urls.py index 04f2f8a..5e4827f 100644 --- a/certificate/urls.py +++ b/certificate/urls.py @@ -8,6 +8,7 @@ urlpatterns = patterns('', # url(r'^$', 'fossee_project.views.home', name='home'), # url(r'^blog/', include('blog.urls')), - url(r'^download/', 'certificate.views.download', name='download'), - url(r'^verify/', 'certificate.views.verify', name='verify'), + url(r'^$', 'certificate.views.download', name='download'), + url(r'^download/$', 'certificate.views.download', name='download'), + url(r'^verify/$', 'certificate.views.verify', name='verify'), ) diff --git a/fossee_project/settings.py b/fossee_project/settings.py index 15dd9ad..0d0018a 100644 --- a/fossee_project/settings.py +++ b/fossee_project/settings.py @@ -46,7 +46,7 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', #'south', 'certificate', - 'csvimport.app.CSVImportConf', + #'csvimport.app.CSVImportConf', ) MIDDLEWARE_CLASSES = ( diff --git a/fossee_project/urls.py b/fossee_project/urls.py index 8ab701f..533e42c 100644 --- a/fossee_project/urls.py +++ b/fossee_project/urls.py @@ -9,5 +9,5 @@ urlpatterns = patterns('', # url(r'^blog/', include('blog.urls')), url(r'^admin/', include(admin.site.urls)), - url(r'^certificate/', include('certificate.urls', namespace='certificate')), + url(r'^', include('certificate.urls', namespace='certificate')), ) |