Merge branch 'master' into components

Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-02-03 12:20:10 -0800
committer: Valerio Virgillito 2012-02-03 12:20:10 -0800
commit: e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree: 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules
parent: 7950424cf704bb221971f4645406b01e6979db18 (diff)
parent: c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
download: ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
110 files changed, 8781 insertions, 3970 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}
+
author	Valerio Virgillito	2012-02-03 12:20:10 -0800
committer	Valerio Virgillito	2012-02-03 12:20:10 -0800
commit	e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree	39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules
parent	7950424cf704bb221971f4645406b01e6979db18 (diff)
parent	c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
download	ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz

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
2573	@class module:montage/core/converter/date-converter.DateConverter	2573	@class module:montage/core/converter/date-converter.DateConverter
2574	*/	2574	*/
2575	var DateConverter = exports.DateConverter = Montage.create(Converter,/** @lends module:montage/core/converter/date-converter.DateConverter# */ {	2575	var DateConverter = exports.DateConverter = Montage.create(Converter,/** @lends module:montage/core/converter/date-converter.DateConverter# */ {
		2576	/**
		2577	Specifies whether the converter allows partial conversion.
		2578	@type {Property}
		2579