Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e6dda2de
authored
Oct 28, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
circle: add rosetta
parent
387eb4e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletions
+18
-1
circle/circle/settings/local.py
+7
-0
circle/circle/urls.py
+10
-1
requirements/local.txt
+1
-0
No files found.
circle/circle/settings/local.py
View file @
e6dda2de
...
@@ -64,6 +64,13 @@ CACHES = {
...
@@ -64,6 +64,13 @@ CACHES = {
########## END CACHE CONFIGURATION
########## END CACHE CONFIGURATION
########## ROSETTA CONFIGURATION
INSTALLED_APPS
+=
(
'rosetta'
,
)
########## END ROSETTA CONFIGURATION
########## TOOLBAR CONFIGURATION
########## TOOLBAR CONFIGURATION
# https://github.com/django-debug-toolbar/django-debug-toolbar#installation
# https://github.com/django-debug-toolbar/django-debug-toolbar#installation
if
get_env_variable
(
'DJANGO_TOOLBAR'
,
'FALSE'
)
==
'TRUE'
:
if
get_env_variable
(
'DJANGO_TOOLBAR'
,
'FALSE'
)
==
'TRUE'
:
...
...
circle/circle/urls.py
View file @
e6dda2de
...
@@ -18,9 +18,11 @@
...
@@ -18,9 +18,11 @@
from
django.conf.urls
import
patterns
,
include
,
url
from
django.conf.urls
import
patterns
,
include
,
url
from
django.views.generic
import
TemplateView
from
django.views.generic
import
TemplateView
from
django.conf
import
settings
from
django.contrib
import
admin
from
django.contrib
import
admin
from
django.shortcuts
import
redirect
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
django.shortcuts
import
redirect
from
circle.settings.base
import
get_env_variable
from
circle.settings.base
import
get_env_variable
from
dashboard.views
import
circle_login
,
HelpView
from
dashboard.views
import
circle_login
,
HelpView
...
@@ -71,6 +73,13 @@ urlpatterns = patterns(
...
@@ -71,6 +73,13 @@ urlpatterns = patterns(
)
)
if
'rosetta'
in
settings
.
INSTALLED_APPS
:
urlpatterns
+=
patterns
(
''
,
url
(
r'^rosetta/'
,
include
(
'rosetta.urls'
)),
)
if
get_env_variable
(
'DJANGO_SAML'
,
'FALSE'
)
==
'TRUE'
:
if
get_env_variable
(
'DJANGO_SAML'
,
'FALSE'
)
==
'TRUE'
:
urlpatterns
+=
patterns
(
urlpatterns
+=
patterns
(
''
,
''
,
...
...
requirements/local.txt
View file @
e6dda2de
...
@@ -2,4 +2,5 @@
...
@@ -2,4 +2,5 @@
-r base.txt
-r base.txt
coverage==3.7.1
coverage==3.7.1
django-debug-toolbar==1.1
django-debug-toolbar==1.1
django-rosetta==0.7.4
Sphinx==1.2.2
Sphinx==1.2.2
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment