Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 9 insertions, 0 deletions

diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js
index b00a5b22..f0d3e540 100755
--- a/node_modules/montage/core/converter/date-converter.js
+++ b/node_modules/montage/core/converter/date-converter.js
@@ -2573,6 +2573,15 @@ var DateValidator = exports.DateValidator = Montage.create(Validator,/** @lends
 @class module:montage/core/converter/date-converter.DateConverter
 */
 var DateConverter = exports.DateConverter = Montage.create(Converter,/** @lends module:montage/core/converter/date-converter.DateConverter# */ {
+    /**
+     Specifies whether the converter allows partial conversion.
+     @type {Property}
+     @default {Boolean} true
+     */
+    allowPartialConversion: {
+        value: false
+    },
+
 /**
         @type {Property}
         @default {Function} Montage.create(DateValidator)