ninja - [ARCHIVED] A fully featured content authoring tool to deploy HTML5 web applications.

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Cleaning up the stage background color chip.	Valerio Virgillito	2012-02-13
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	Valerio Virgillito	2012-02-12
\| \|\ \| \| \| \| \| \| \| \| \|	stage-color
\| \| *	Support export/import of GLLine data.	Nivesh Rajbhandari	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Fixed switching between webGL and canvas 2d modes.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	initial color chip for the stage	Valerio Virgillito	2012-02-10
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Setting defaults and more cleanup	Valerio Virgillito	2012-02-09
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-09
\|\\|
\| *	Fixed several typos in Materials import/export code to support toggling ↵	Nivesh Rajbhandari	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \|	between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-08
\|\\|
\| *	Fixing some typos and undeclared variables in GLRectangle and ShapesController.	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \|	makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Fixed PI to support WebGL materials.	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Force layout canvas and SelectionController to update their info when a 2d ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \|	canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Support toggling between 2d and 3d canvas context. This requires us to ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \|	create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Add enabled property for ComboBox to support enabling/disabling materials ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \|	dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Allow users to switch between 2d and webGL mode. Note that this doesn't ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \|	currently work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Support use WebGL checkbox in the PI.	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	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>