Commit 5e14d045 by Han Su Kim

Merge pull request #2814 from gsehub/xblock-mentoring

xblock-mentoring: Add repository to requirements & installed apps
parents b0a4cc7a 0864d575
...@@ -34,7 +34,7 @@ from path import path ...@@ -34,7 +34,7 @@ from path import path
from lms.lib.xblock.mixin import LmsBlockMixin from lms.lib.xblock.mixin import LmsBlockMixin
from cms.lib.xblock.mixin import CmsBlockMixin from cms.lib.xblock.mixin import CmsBlockMixin
from xmodule.modulestore.inheritance import InheritanceMixin from xmodule.modulestore.inheritance import InheritanceMixin
from xmodule.x_module import XModuleMixin, only_xmodules from xmodule.x_module import XModuleMixin, prefer_xmodules
from dealer.git import git from dealer.git import git
############################ FEATURE CONFIGURATION ############################# ############################ FEATURE CONFIGURATION #############################
...@@ -222,15 +222,10 @@ X_FRAME_OPTIONS = 'ALLOW' ...@@ -222,15 +222,10 @@ X_FRAME_OPTIONS = 'ALLOW'
# once the responsibility of XBlock creation is moved out of modulestore - cpennington # once the responsibility of XBlock creation is moved out of modulestore - cpennington
XBLOCK_MIXINS = (LmsBlockMixin, CmsBlockMixin, InheritanceMixin, XModuleMixin) XBLOCK_MIXINS = (LmsBlockMixin, CmsBlockMixin, InheritanceMixin, XModuleMixin)
# Only allow XModules in Studio # Allow any XBlock in Studio
XBLOCK_SELECT_FUNCTION = only_xmodules
# Use the following lines to allow any xblock in Studio,
# either by uncommenting them here, or adding them to your private.py
# You should also enable the ALLOW_ALL_ADVANCED_COMPONENTS feature flag, so that # You should also enable the ALLOW_ALL_ADVANCED_COMPONENTS feature flag, so that
# xblocks can be added via advanced settings # xblocks can be added via advanced settings
# from xmodule.x_module import prefer_xmodules XBLOCK_SELECT_FUNCTION = prefer_xmodules
# XBLOCK_SELECT_FUNCTION = prefer_xmodules
############################ SIGNAL HANDLERS ################################ ############################ SIGNAL HANDLERS ################################
# This is imported to register the exception signal handling that logs exceptions # This is imported to register the exception signal handling that logs exceptions
...@@ -472,6 +467,9 @@ INSTALLED_APPS = ( ...@@ -472,6 +467,9 @@ INSTALLED_APPS = (
# for course creator table # for course creator table
'django.contrib.admin', 'django.contrib.admin',
# XBlocks containing migrations
'mentoring',
# for managing course modes # for managing course modes
'course_modes', 'course_modes',
......
...@@ -34,7 +34,7 @@ from .discussionsettings import * ...@@ -34,7 +34,7 @@ from .discussionsettings import *
from lms.lib.xblock.mixin import LmsBlockMixin from lms.lib.xblock.mixin import LmsBlockMixin
from xmodule.modulestore.inheritance import InheritanceMixin from xmodule.modulestore.inheritance import InheritanceMixin
from xmodule.x_module import XModuleMixin, only_xmodules from xmodule.x_module import XModuleMixin, prefer_xmodules
################################### FEATURES ################################### ################################### FEATURES ###################################
# The display name of the platform to be used in templates/emails/etc. # The display name of the platform to be used in templates/emails/etc.
...@@ -435,13 +435,8 @@ DOC_STORE_CONFIG = { ...@@ -435,13 +435,8 @@ DOC_STORE_CONFIG = {
# once the responsibility of XBlock creation is moved out of modulestore - cpennington # once the responsibility of XBlock creation is moved out of modulestore - cpennington
XBLOCK_MIXINS = (LmsBlockMixin, InheritanceMixin, XModuleMixin) XBLOCK_MIXINS = (LmsBlockMixin, InheritanceMixin, XModuleMixin)
# Only allow XModules in the LMS # Allow any XBlock in the LMS
XBLOCK_SELECT_FUNCTION = only_xmodules XBLOCK_SELECT_FUNCTION = prefer_xmodules
# Use the following lines to allow any xblock in the LMS,
# either by uncommenting them here, or adding them to your private.py
# from xmodule.x_module import prefer_xmodules
# XBLOCK_SELECT_FUNCTION = prefer_xmodules
#################### Python sandbox ############################################ #################### Python sandbox ############################################
...@@ -1164,6 +1159,9 @@ INSTALLED_APPS = ( ...@@ -1164,6 +1159,9 @@ INSTALLED_APPS = (
'reverification', 'reverification',
'embargo', 'embargo',
# XBlocks containing migrations
'mentoring',
) )
######################### MARKETING SITE ############################### ######################### MARKETING SITE ###############################
......
# Requirements for edx.org that aren't necessarily needed for Open edX.
-e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@df9d048e331a642193e5aa2e03650fb84a9d715f#egg=edx-jsdraw -e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@df9d048e331a642193e5aa2e03650fb84a9d715f#egg=edx-jsdraw
-e git+https://github.com/gsehub/xblock-mentoring.git@69a546eadeb4d038f6851bb54286c6c6fdbe8c87#egg=xblock-mentoring
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment