Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical

Convert Vertical XModule to pure Vertical XBlock.
2015-03-31 11:10:22 -04:00
parent d9611dcd9f a0bae0c794
commit 8f133f6696
39 changed files with 616 additions and 363 deletions
--- a/common/test/data/aside/policies/2012_Fall.json
+++ b/common/test/data/aside/policies/2012_Fall.json
@@ -3,7 +3,7 @@
        "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
        "start": "2015-07-17T12:00",
        "display_name": "Toy Course",
-        "graded": "true",
+        "graded": "true"
    },
    "tabs": [
          {"type": "courseware"},
@@ -19,5 +19,5 @@
    },
    "html/secret:toylab": {
        "display_name": "Toy lab"
-    },
+    }
 }
--- a/common/test/data/xml_dag/policies/2012_Fall.json
+++ b/common/test/data/xml_dag/policies/2012_Fall.json
@@ -3,6 +3,6 @@
        "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
        "start": "2015-07-17T12:00",
        "display_name": "Toy Course",
-        "graded": "true",
+        "graded": "true"
    }
 }