Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
6abc2d73
Commit
6abc2d73
authored
Aug 08, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #370 from MITx/feature/bridger/django1.4
Feature/bridger/django1.4
parents
d5dd59bc
9df10c58
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9 additions
and
9 deletions
+9
-9
askbot
+1
-1
cms/envs/common.py
+1
-1
cms/urls.py
+1
-1
common/djangoapps/util/json_request.py
+1
-1
lms/djangoapps/heartbeat/urls.py
+1
-1
lms/djangoapps/simplewiki/urls.py
+1
-1
lms/envs/common.py
+1
-1
lms/urls.py
+1
-1
requirements.txt
+1
-1
No files found.
askbot
@
e56ae380
Subproject commit
1c3381046c78e055439ba1c78e0df48410fcc13e
Subproject commit
e56ae380846f7c6cdaeacfc58880fab103540491
cms/envs/common.py
View file @
6abc2d73
...
@@ -83,7 +83,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
...
@@ -83,7 +83,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request'
,
'django.core.context_processors.request'
,
'django.core.context_processors.static'
,
'django.core.context_processors.static'
,
'django.contrib.messages.context_processors.messages'
,
'django.contrib.messages.context_processors.messages'
,
'django.co
re
.context_processors.auth'
,
# this is required for admin
'django.co
ntrib.auth
.context_processors.auth'
,
# this is required for admin
'django.core.context_processors.csrf'
,
# necessary for csrf protection
'django.core.context_processors.csrf'
,
# necessary for csrf protection
)
)
...
...
cms/urls.py
View file @
6abc2d73
from
django.conf
import
settings
from
django.conf
import
settings
from
django.conf.urls
.defaults
import
patterns
,
include
,
url
from
django.conf.urls
import
patterns
,
include
,
url
import
django.contrib.auth.views
import
django.contrib.auth.views
...
...
common/djangoapps/util/json_request.py
View file @
6abc2d73
...
@@ -9,7 +9,7 @@ def expect_json(view_function):
...
@@ -9,7 +9,7 @@ def expect_json(view_function):
if
request
.
META
[
'CONTENT_TYPE'
]
==
"application/json"
:
if
request
.
META
[
'CONTENT_TYPE'
]
==
"application/json"
:
cloned_request
=
copy
.
copy
(
request
)
cloned_request
=
copy
.
copy
(
request
)
cloned_request
.
POST
=
cloned_request
.
POST
.
copy
()
cloned_request
.
POST
=
cloned_request
.
POST
.
copy
()
cloned_request
.
POST
.
update
(
json
.
loads
(
request
.
raw_post_data
))
cloned_request
.
POST
.
update
(
json
.
loads
(
request
.
body
))
return
view_function
(
cloned_request
,
*
args
,
**
kwargs
)
return
view_function
(
cloned_request
,
*
args
,
**
kwargs
)
else
:
else
:
return
view_function
(
request
,
*
args
,
**
kwargs
)
return
view_function
(
request
,
*
args
,
**
kwargs
)
...
...
lms/djangoapps/heartbeat/urls.py
View file @
6abc2d73
from
django.conf.urls
.defaults
import
*
from
django.conf.urls
import
*
urlpatterns
=
patterns
(
''
,
urlpatterns
=
patterns
(
''
,
url
(
r'^$'
,
'heartbeat.views.heartbeat'
,
name
=
'heartbeat'
),
url
(
r'^$'
,
'heartbeat.views.heartbeat'
,
name
=
'heartbeat'
),
...
...
lms/djangoapps/simplewiki/urls.py
View file @
6abc2d73
from
django.conf.urls
.defaults
import
patterns
,
url
from
django.conf.urls
import
patterns
,
url
namespace_regex
=
r"[a-zA-Z\d._-]+"
namespace_regex
=
r"[a-zA-Z\d._-]+"
article_slug
=
r'/(?P<article_path>'
+
namespace_regex
+
r'/[a-zA-Z\d_-]*)'
article_slug
=
r'/(?P<article_path>'
+
namespace_regex
+
r'/[a-zA-Z\d_-]*)'
...
...
lms/envs/common.py
View file @
6abc2d73
...
@@ -109,7 +109,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
...
@@ -109,7 +109,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.contrib.messages.context_processors.messages'
,
'django.contrib.messages.context_processors.messages'
,
#'django.core.context_processors.i18n',
#'django.core.context_processors.i18n',
'askbot.user_messages.context_processors.user_messages'
,
#must be before auth
'askbot.user_messages.context_processors.user_messages'
,
#must be before auth
'django.co
re
.context_processors.auth'
,
#this is required for admin
'django.co
ntrib.auth
.context_processors.auth'
,
#this is required for admin
'django.core.context_processors.csrf'
,
#necessary for csrf protection
'django.core.context_processors.csrf'
,
#necessary for csrf protection
)
)
...
...
lms/urls.py
View file @
6abc2d73
from
django.conf
import
settings
from
django.conf
import
settings
from
django.conf.urls
.defaults
import
patterns
,
include
,
url
from
django.conf.urls
import
patterns
,
include
,
url
from
django.contrib
import
admin
from
django.contrib
import
admin
from
django.conf.urls.static
import
static
from
django.conf.urls.static
import
static
...
...
requirements.txt
View file @
6abc2d73
django
<1.4
django
>=1.4,<1.5
pip
pip
numpy
numpy
scipy
scipy
...
...
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