Merge branch 'master' into open638_rebase

2016-02-23 10:56:13 -08:00
parent 7d0de68db9 77a2e0a70b
commit fcdf89a4ee
155 changed files with 2018 additions and 52049 deletions
--- a/platform/forms/lib/moment.min.js
+++ b/platform/forms/lib/moment.min.js
--- a/platform/forms/src/controllers/DateTimeController.js
+++ b/platform/forms/src/controllers/DateTimeController.js
@@ -22,8 +22,8 @@
 /*global define,moment*/

 define(
-    ["../../lib/moment.min"],
-    function () {
+    ["moment"],
+    function (moment) {
        "use strict";

        var DATE_FORMAT = "YYYY-MM-DD";
--- a/platform/forms/test/controllers/DateTimeControllerSpec.js
+++ b/platform/forms/test/controllers/DateTimeControllerSpec.js
@@ -26,7 +26,7 @@ define(
    function (DateTimeController) {
        "use strict";

-        describe("The date-time directive", function () {
+        describe("The date-time controller", function () {
            var mockScope,
                controller;