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
14a35b96
Commit
14a35b96
authored
Aug 08, 2012
by
Bridger Maxwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrading to django 1.4.
parent
ebd0458d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
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.
cms/urls.py
View file @
14a35b96
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
...
...
common/djangoapps/util/json_request.py
View file @
14a35b96
...
...
@@ -9,7 +9,7 @@ def expect_json(view_function):
if
request
.
META
[
'CONTENT_TYPE'
]
==
"application/json"
:
cloned_request
=
copy
.
copy
(
request
)
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
)
else
:
return
view_function
(
request
,
*
args
,
**
kwargs
)
...
...
lms/djangoapps/heartbeat/urls.py
View file @
14a35b96
from
django.conf.urls
.defaults
import
*
from
django.conf.urls
import
*
urlpatterns
=
patterns
(
''
,
url
(
r'^$'
,
'heartbeat.views.heartbeat'
,
name
=
'heartbeat'
),
...
...
lms/djangoapps/simplewiki/urls.py
View file @
14a35b96
from
django.conf.urls
.defaults
import
patterns
,
url
from
django.conf.urls
import
patterns
,
url
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 @
14a35b96
...
...
@@ -109,7 +109,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.contrib.messages.context_processors.messages'
,
#'django.core.context_processors.i18n',
'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
)
...
...
lms/urls.py
View file @
14a35b96
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.conf.urls.static
import
static
...
...
requirements.txt
View file @
14a35b96
django
<1.4
django
>=1.4,<1.5
pip
numpy
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