mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting

Browse source 
Conflicts:
dynamicweb/settings.py
    Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
   Added railshosting url.

Signed-off-by: rscnt <rascnt@gmail.com>
This commit is contained in:
rascencio 2015-05-30 15:22:47 -06:00
commit 5d9c306573
85 changed files with 15745 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dynamicweb/urls.py
View file

@ -1,7 +1,6 @@
from django.conf.urls import patterns, include, url
from django.contrib import admin
# deprecated in version 1.8
from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.static import static
from dynamicweb import settings
@ -9,13 +8,16 @@ urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^digital.glarus/', include('digital_glarus.urls',
namespace="digital_glarus")),
url(r'^railshosting/', include('railshosting.urls',
namespace="railshosting")),
url(r'^', include('cms.urls')),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
if settings.DEBUG:
urlpatterns += patterns('',
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
'document_root': settings.MEDIA_ROOT,
}),
)
url(r'^media/(?P<path>.*)$',
'django.views.static.serve', {
'document_root': settings.MEDIA_ROOT,
}),
)