Skip to content

xblock-mentoring: Add repository to requirements & installed apps #2814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hkim823 merged 2 commits into from
Mar 5, 2014
Merged

xblock-mentoring: Add repository to requirements & installed apps #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3856257
xblock-mentoring: Add repository to requirements & installed apps
antoviaque Mar 2, 2014
0864d57
Activate XBlocks by default in LMS & Studio
antoviaque Mar 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions cms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from lms.lib.xblock.mixin import LmsBlockMixin
from cms.lib.xblock.mixin import CmsBlockMixin
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

############################ FEATURE CONFIGURATION #############################
Expand Down Expand Up @@ -222,15 +222,10 @@
# once the responsibility of XBlock creation is moved out of modulestore - cpennington
XBLOCK_MIXINS = (LmsBlockMixin, CmsBlockMixin, InheritanceMixin, XModuleMixin)

# Only allow XModules 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
# Allow any XBlock in Studio
# You should also enable the ALLOW_ALL_ADVANCED_COMPONENTS feature flag, so that
# 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 ################################
# This is imported to register the exception signal handling that logs exceptions
Expand Down Expand Up @@ -472,6 +467,9 @@
# for course creator table
'django.contrib.admin',

# XBlocks containing migrations
'mentoring',

# for managing course modes
'course_modes',

Expand Down
14 changes: 6 additions & 8 deletions lms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

from lms.lib.xblock.mixin import LmsBlockMixin
from xmodule.modulestore.inheritance import InheritanceMixin
from xmodule.x_module import XModuleMixin, only_xmodules
from xmodule.x_module import XModuleMixin, prefer_xmodules

################################### FEATURES ###################################
# The display name of the platform to be used in templates/emails/etc.
Expand Down Expand Up @@ -435,13 +435,8 @@
# once the responsibility of XBlock creation is moved out of modulestore - cpennington
XBLOCK_MIXINS = (LmsBlockMixin, InheritanceMixin, XModuleMixin)

# Only allow XModules in the LMS
XBLOCK_SELECT_FUNCTION = only_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
# Allow any XBlock in the LMS
XBLOCK_SELECT_FUNCTION = prefer_xmodules

#################### Python sandbox ############################################

Expand Down Expand Up @@ -1164,6 +1159,9 @@
'reverification',

'embargo',

# XBlocks containing migrations
'mentoring',
)

######################### MARKETING SITE ###############################
Expand Down
3 changes: 3 additions & 0 deletions requirements/edx/edx-private.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# 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+https://github.com/gsehub/xblock-mentoring.git@69a546eadeb4d038f6851bb54286c6c6fdbe8c87#egg=xblock-mentoring