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
2303500c
Commit
2303500c
authored
May 22, 2013
by
Vik Paruchuri
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
parents
9a52a17a
e4c3f923
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
8 deletions
+13
-8
.reviewboardrc
+2
-0
cms/djangoapps/contentstore/views/component.py
+1
-1
cms/envs/acceptance.py
+1
-1
common/lib/calc/setup.py
+1
-1
common/lib/chem/setup.py
+1
-1
common/lib/sandbox-packages/setup.py
+1
-1
requirements/edx-sandbox/local.txt
+6
-0
requirements/edx-sandbox/post.txt
+0
-3
No files found.
.reviewboardrc
0 → 100644
View file @
2303500c
REVIEWBOARD_URL = "https://rbcommons.com/s/edx/"
GUESS_FIELDS = True
cms/djangoapps/contentstore/views/component.py
View file @
2303500c
...
@@ -42,7 +42,7 @@ COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video']
...
@@ -42,7 +42,7 @@ COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video']
OPEN_ENDED_COMPONENT_TYPES
=
[
"combinedopenended"
,
"peergrading"
]
OPEN_ENDED_COMPONENT_TYPES
=
[
"combinedopenended"
,
"peergrading"
]
NOTE_COMPONENT_TYPES
=
[
'notes'
]
NOTE_COMPONENT_TYPES
=
[
'notes'
]
ADVANCED_COMPONENT_TYPES
=
[
'annotatable'
+
'word_cloud'
]
+
OPEN_ENDED_COMPONENT_TYPES
+
NOTE_COMPONENT_TYPES
ADVANCED_COMPONENT_TYPES
=
[
'annotatable'
,
'word_cloud'
]
+
OPEN_ENDED_COMPONENT_TYPES
+
NOTE_COMPONENT_TYPES
ADVANCED_COMPONENT_CATEGORY
=
'advanced'
ADVANCED_COMPONENT_CATEGORY
=
'advanced'
ADVANCED_COMPONENT_POLICY_KEY
=
'advanced_modules'
ADVANCED_COMPONENT_POLICY_KEY
=
'advanced_modules'
...
...
cms/envs/acceptance.py
View file @
2303500c
...
@@ -28,7 +28,7 @@ MODULESTORE_OPTIONS = {
...
@@ -28,7 +28,7 @@ MODULESTORE_OPTIONS = {
MODULESTORE
=
{
MODULESTORE
=
{
'default'
:
{
'default'
:
{
'ENGINE'
:
'xmodule.modulestore.mongo.MongoModuleStore'
,
'ENGINE'
:
'xmodule.modulestore.mongo.
Draft
MongoModuleStore'
,
'OPTIONS'
:
MODULESTORE_OPTIONS
'OPTIONS'
:
MODULESTORE_OPTIONS
},
},
'direct'
:
{
'direct'
:
{
...
...
common/lib/calc/setup.py
View file @
2303500c
...
@@ -2,7 +2,7 @@ from setuptools import setup
...
@@ -2,7 +2,7 @@ from setuptools import setup
setup
(
setup
(
name
=
"calc"
,
name
=
"calc"
,
version
=
"0.1"
,
version
=
"0.1
.1
"
,
py_modules
=
[
"calc"
],
py_modules
=
[
"calc"
],
install_requires
=
[
install_requires
=
[
"pyparsing==1.5.6"
,
"pyparsing==1.5.6"
,
...
...
common/lib/chem/setup.py
View file @
2303500c
...
@@ -2,7 +2,7 @@ from setuptools import setup
...
@@ -2,7 +2,7 @@ from setuptools import setup
setup
(
setup
(
name
=
"chem"
,
name
=
"chem"
,
version
=
"0.1"
,
version
=
"0.1
.1
"
,
packages
=
[
"chem"
],
packages
=
[
"chem"
],
install_requires
=
[
install_requires
=
[
"pyparsing==1.5.6"
,
"pyparsing==1.5.6"
,
...
...
common/lib/sandbox-packages/setup.py
View file @
2303500c
...
@@ -2,7 +2,7 @@ from setuptools import setup
...
@@ -2,7 +2,7 @@ from setuptools import setup
setup
(
setup
(
name
=
"sandbox-packages"
,
name
=
"sandbox-packages"
,
version
=
"0.1"
,
version
=
"0.1
.1
"
,
packages
=
[
packages
=
[
"verifiers"
,
"verifiers"
,
],
],
...
...
requirements/edx-sandbox/local.txt
0 → 100644
View file @
2303500c
# Install these packages from the edx-platform working tree
# NOTE: if you change code in these packages, you MUST change the version
# number in its setup.py or the code WILL NOT be installed during deploy.
common/lib/calc
common/lib/chem
common/lib/sandbox-packages
requirements/edx-sandbox/post.txt
View file @
2303500c
# Packages to install in the Python sandbox for secured execution.
# Packages to install in the Python sandbox for secured execution.
scipy==0.11.0
scipy==0.11.0
lxml==3.0.1
lxml==3.0.1
-e common/lib/calc
-e common/lib/chem
-e common/lib/sandbox-packages
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