Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
osp
tools.ethertoff
Commits
20e2e465
Commit
20e2e465
authored
Oct 19, 2018
by
svilayphiou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merging change on ethertoff context_processors by Gijs on Contour branch
parent
f54e5a1a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
ethertoff/context_processors.py
ethertoff/context_processors.py
+1
-1
ethertoff/settings.py
ethertoff/settings.py
+4
-1
No files found.
ethertoff/context_processors.py
View file @
20e2e465
...
...
@@ -7,7 +7,7 @@ from datetime import datetime
from
ethertoff.settings
import
MEDIA_ROOT
from
etherpadlite.models
import
Pad
,
PadAuthor
,
PadServer
from
django.contrib.auth.models
import
AnonymousUser
from
django.contrib.sites.
model
s
import
get_current_site
from
django.contrib.sites.
shortcut
s
import
get_current_site
class
EthertoffError
(
Exception
):
...
...
ethertoff/settings.py
View file @
20e2e465
...
...
@@ -37,7 +37,7 @@ INSTALLED_APPS = [
'django.contrib.sessions'
,
'django.contrib.messages'
,
'django.contrib.staticfiles'
,
#
'django.contrib.sites',
'django.contrib.sites'
,
'etherpadlite'
,
'ethertoff'
,
#'south'
...
...
@@ -66,6 +66,9 @@ TEMPLATES = [
'django.template.context_processors.request'
,
'django.contrib.auth.context_processors.auth'
,
'django.contrib.messages.context_processors.messages'
,
'ethertoff.context_processors.site_name'
,
'ethertoff.context_processors.pads'
,
'ethertoff.context_processors.local'
,
],
},
},
...
...
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