From e16fad35405dfc3c69605471368deb09dedc2535 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 16 Dec 2014 15:26:46 -0500 Subject: [PATCH] Add the Microsoft Office Mix XBlock --- cms/envs/common.py | 2 ++ requirements/edx/edx-private.txt | 3 +++ 2 files changed, 5 insertions(+) diff --git a/cms/envs/common.py b/cms/envs/common.py index 5e8c144cc7..930ab32438 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1009,6 +1009,8 @@ ADVANCED_COMPONENT_TYPES = [ 'notes', 'schoolyourself_review', 'schoolyourself_lesson', + # Office Mix + 'officemix', # Google Drive embedded components. These XBlocks allow one to # embed public google drive documents and calendars within edX units diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt index a427e79aef..a99e196faa 100644 --- a/requirements/edx/edx-private.txt +++ b/requirements/edx/edx-private.txt @@ -7,6 +7,9 @@ # Oppia XBlock -e git+https://github.com/oppia/xblock.git@9f6b95b7eb7dbabb96b77198a3202604f96adf65#egg=oppia-xblock +# Microsoft's Office Mix XBlock: +-e git+https://github.com/OfficeDev/xblock-officemix.git@3f876b5f0267b017812620239533a29c7d562d24#egg=officemix + # This repository contains schoolyourself-xblock, which is used in # edX's "AlgebraX" and "GeometryX" courses. -e git+https://github.com/schoolyourself/schoolyourself-xblock.git@5e4d37716e3e72640e832e961f7cc0d38d4ec47b#egg=schoolyourself-xblock