ninja - [ARCHIVED 2012] An HTML5 web app content authoring tool

	Commit message (Collapse)	Author	Age
...
* \| \| \|	Merge branch 'master' into components	Valerio Virgillito	2012-02-06
\|\\| \| \|
\| * \| \|	Merge branch 'refs/heads/NiveshColor' into ToolFixes	Nivesh Rajbhandari	2012-02-03
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Removed border special-casing from PI since the mediator now handles this ↵	Nivesh Rajbhandari	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Updated color code in the PI to go through element mediator.	Nivesh Rajbhandari	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Updated color code to handle shapes.	Nivesh Rajbhandari	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \|	button component using json data	Valerio Virgillito	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \|	Merge branch 'master' into components	Valerio Virgillito	2012-02-03
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| * \| \|	Integrating Pan and Zoom tool and snap manager fixes.	Nivesh Rajbhandari	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵	Nivesh Rajbhandari	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Fixing 3d section of the PI.	Nivesh Rajbhandari	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Fixed issue with elements not drawing in the correct plane.	Nivesh Rajbhandari	2012-01-30
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / /	Simple button native widget test. Added a controller, pi and panel code.	Valerio Virgillito	2012-02-01
\|/ / \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* /	Updated canvas controller to override setProperties so we don't set styles ↵	Nivesh Rajbhandari	2012-01-27
\|/ \| \| \| \| \|	when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>