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

:Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar

Browse source 
Conflicts:
	dynamicweb/urls.py
This commit is contained in:
rascencio 2016-04-23 19:08:23 +02:00
commit c653917358
25 changed files with 6477 additions and 3800 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dynamicweb/settings/base.py
View file

@ -282,9 +282,9 @@ CACHES = {
}
if LOGIN_URL is None:
LOGIN_URL = APP_ROOT_ENDPOINT + 'accounts/login/'
LOGIN_URL = APP_ROOT_ENDPOINT + 'login/'
if LOGOUT_URL is None:
LOGOUT_URL = APP_ROOT_ENDPOINT + 'accounts/logout/'
LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/'
if LOGIN_REDIRECT_URL is None:
LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT

10
dynamicweb/urls.py
View file

@ -5,18 +5,11 @@ from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.static import static
from django.conf import settings
<<<<<<< HEAD
from hosting.views import railshosting, nodejshosting, djangohosting
=======
from hosting.views import RailsHostingView
>>>>>>> remotes/origin/feature/vm_pricing
from membership import urls as membership_urls
urlpatterns = [
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^railshosting/', railshosting, name="rails.hosting"),
url(r'^nodehosting/', nodejshosting, name="node.hosting"),
url(r'^djangohosting/', djangohosting, name="django.hosting"),
url(r'^railshosting/', RailsHostingView.as_view(), name="rails.hosting"),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$',
@ -33,7 +26,8 @@ urlpatterns += i18n_patterns('',
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus"),name='digitalglarus'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name="ungleich_page"),
url(r'^login/',include(membership_urls)),
url(r'^$',include('ungleich_page.urls',namespace='ungleich_page'),name="ungleich_page"),
url(r'^', include('cms.urls')),
)