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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidate	Jonathan Duran	2012-06-21
\|\
\| *	Sub Property ADding KEyframe fixed	Kruti Shah	2012-06-21
\| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \|	Merge pull request #316 from imix23ways/Timeline-merge-candidate	Valerio Virgillito	2012-06-20
\|\ \ \| \| \| \| \| \|	Timeline merge candidate
\| * \	Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #317 from joseeight/Color	Valerio Virgillito	2012-06-20
\|\ \ \ \| \| \| \| \| \| \| \|	Color
\| * \ \	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-20
\| \|\ \ \
\| * \| \| \|	Fixes: IKNINJA-1448	Jose Antonio Marquez	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improving logic on calculating position of the color stops in the gradient picker.
* \| \| \| \|	Merge pull request #315 from mqg734/IKNinja_1671	Valerio Virgillito	2012-06-20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated in negative space.
\| * \| \| \| \|	Fix for error when using ZoomTool.	Nivesh Rajbhandari	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into IKNinja_1671	Nivesh Rajbhandari	2012-06-20
\| \|\ \ \ \ \
\| * \| \| \| \| \|	IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated ↵	Nivesh Rajbhandari	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in negative space. I fixed this temporarily by disabling the auto stage scroll calculations when we modify matrices. The correct fix will be to update any matrices and local2Global caches if we update the stage's padding (which I'm doing in a separate fix for a single draw cycle for the stage, but that fix is not ready yet). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \|	Merge pull request #314 from ericmueller/Grid	Valerio Virgillito	2012-06-20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added logic to handle grid drawing where grid line starts on an object b...
\| * \ \ \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Grid	hwc487	2012-06-20
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Added logic to handle grid drawing where grid line starts on an object boundary	hwc487	2012-06-19
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| \| \| \| \| * \|	remove bad file	Jonathan Duran	2012-06-20
\| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| \| \| \| *	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-06-20
\| \| \| \| \| \| \|\
\| \| \| \| \| \| \| *	Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| *	Timeline: Bug fix: Keyframe animation now works with 3D elements.	Jon Reid	2012-06-20
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| *	Merge remote-tracking branch 'ninja-internal/master' into timeline-local	Jon Reid	2012-06-20
\| \| \| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| *	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-20
\| \| \| \| \| \| \| \| \|\ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| \| \| \| \| \| \| * \|	Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\| \| \| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-06-20
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #313 from mqg734/GIO_Fixes	Valerio Virgillito	2012-06-20
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|	IKNINJA-1519 - Transform tool does not transform objects correctly in 3D space or in Top/Side view.
\| \| * \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into GIO_Fixes	Nivesh Rajbhandari	2012-06-19
\| \| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	IKNINJA-1519 - Transform tool does not transform objects correctly in 3D ↵	Nivesh Rajbhandari	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	space or in Top/Side view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \|	Merge pull request #312 from joseeight/Color	Valerio Virgillito	2012-06-20
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| / / / / \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|	Fixing logic to close color panel popup
\| \| * \| \| \| \| \|	Fixing logic to close color panel popup	Jose Antonio Marquez	2012-06-19
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This resolves closing the color panel popup when a user make a click outside the popup area or resizes the Ninja window. This should be tested prior to merging.
* \| \| \| \| \| \|	fixing the css panel button hover	Valerio Virgillito	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \|	remove the un-used css file	Valerio Virgillito	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \|	fixing the last instances of the old montage components in the css panel	Valerio Virgillito	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/master' into montage-v11-integration	Valerio Virgillito	2012-06-20
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \|	fixing the css bugs with montage v11	Valerio Virgillito	2012-06-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \|	fixing the components.	Valerio Virgillito	2012-06-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/master' into montage-v11-integration	Valerio Virgillito	2012-06-18
\|\ \ \ \ \ \ \
* \| \| \| \| \| \| \|	updating the components and descriptor.json to support montage v.11	Valerio Virgillito	2012-06-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \|	montage v11 merge into ninja	Valerio Virgillito	2012-06-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| \| \| * \|	remove old method	Jonathan Duran	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| \| \| \| * \|	remove unneeded files	Jonathan Duran	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| \| \| \| * \|	Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\| \| \| \| \| \| \|\ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| / \| \| \| \| \| \| \|/
\| \| * \| \| \| \|	Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal	Valerio Virgillito	2012-06-19
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \| \| \| \|	IKNINJA 1754 menu not opening on hover	Valerio Virgillito	2012-06-19
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \|	Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal	Valerio Virgillito	2012-06-19
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Reverting last change since this is is being made in a different pull request.	Ananya Sen	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \|