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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-02
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
\| *	Merge branch 'montage-integration' into staging	Valerio Virgillito	2012-02-02
\| \|\
\| \| *	Fixed the color popups to work with m-js v6	Jose Antonio Marquez	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \|	Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified.
\| \| *	upgrading to Montage v0.6	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Fixes for montage integration	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	upgrading to Montage v0.6	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Fixes for montage integration	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Merge pull request #12 from mqg734/ToolFixes	Valerio Virgillito	2012-02-02
\| \|\ \ \| \| \| \| \| \| \| \|	Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties.
\| \| * \|	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>
\| \| * \|	Support stage in PI's 3d section.	Nivesh Rajbhandari	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Merging Jose's colorchip change.	Nivesh Rajbhandari	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	CSSPanel Updates - Add new original CSS error icon	Eric Guzman	2012-01-30
\| \| \| \|
\| * \| \|	Delete unneeded compass log file (IKNINJA 1101).	Jon Reid	2012-02-01
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Update base styles for better colors on HTML buttons. Change project panel so it shows no project by default.
\| * \|	IKNINJA-1083	Jose Antonio Marquez	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \|	Fixing minor bug with no color breaking on null alpha value.
* \| \|	Updated color code in the PI to go through element mediator.	Nivesh Rajbhandari	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	IKNINJA-1083	Jose Antonio Marquez	2012-01-30
\|/ / \| \| \| \| \| \|	Fixing minor bug with no color breaking on null alpha value.
* /	CSSPanel Updates - Add new original CSS error icon	Eric Guzman	2012-01-30
\|/
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>