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

	Commit message (Collapse)	Author	Age
*	Oval stroke and fill material were stored in inverted order.	hwc487	2012-06-13
\|
*	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-13
\|\ \| \| \| \| \| \|	Textures
\| *	Merge pull request #297 from mqg734/PI_HotTextFixes	Valerio Virgillito	2012-06-13
\| \|\ \| \| \| \| \| \|	Fixing properties panel to support px and % for body and other elements.
\| \| *	Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes	Nivesh Rajbhandari	2012-06-13
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-13
\| \|\ \
\| * \| \|	fixed document switching issues	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	disabling the warnings	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-12
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \ \ \	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-12
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-12
\| \|\ \ \ \ \
\| * \| \| \| \| \|	hack fix for the PI section throwing errors when dom is not ready to draw	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	remove serializable from custom section	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	fixing the feed reader	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	fix for the the components not rendering and not selecting	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	adding more missing properties to the serialization	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	Merge branch 'montage-v10-integration' of ↵	Valerio Virgillito	2012-06-12
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
\| \| * \ \ \ \ \	Merge pull request #296 from imix23ways/jd-pullreq	Valerio Virgillito	2012-06-12
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix montage serialization in timeline for v10
\| \| \| * \| \| \| \| \|	montage v10 serialization updates for timeline	Jonathan Duran	2012-06-12
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \| \| \|	adding more nonexistent properties	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \|	fixing a default property	Valerio Virgillito	2012-06-12
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	fix a typo	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	Merge pull request #295 from jreid01/pullrequest-v10	Valerio Virgillito	2012-06-12
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Timeline: Update document switching to work under Montage v.10
\| \| * \| \| \| \| \|	Timeline: Fix document switching under Montage v.10	Jon Reid	2012-06-12
\| \|/ / / / / /
\| * \| \| \| \| \|	fixing a timeline issue	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	adding more missing properties to the timeline	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	removing the serializable from the timeline repetition and fixing the panels ↵	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	currentDocument binding Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	adding more missing properties	Valerio Virgillito	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	adding more missing properties	Valerio Virgillito	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	removing serializable to the tree and adding a few more missing properties	Valerio Virgillito	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-11
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \ \ \ \ \ \	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-06
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \|	first iteration of adding serializable to ninja plus other changes to run ↵	Valerio Virgillito	2012-06-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \|	adding the latest v0.10 montage	Valerio Virgillito	2012-06-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| \| \| \| \| *	We need to guard against cases where some PI controls are using HottextUnit ↵	Nivesh Rajbhandari	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	but don't actually allow uses to change those units. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| \| \| \| \| *	Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes	Nivesh Rajbhandari	2012-06-13
\| \| \| \| \| \| \| \| \|\ \| \| \| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \|/\|
\| \| \| \| \| \| \| \| *	Fixing properties panel to support px and % for body and other elements.	Nivesh Rajbhandari	2012-06-12
\| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \|	Material bug fixes - reset texture array.	hwc487	2012-06-13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-13
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures Conflicts: js/io/system/ninjalibrary.json
\| * \| \| \| \| \| \|	Merge pull request #291 from joseeight/TempPromptUI	Valerio Virgillito	2012-06-13
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|	Adding temp prompts
\| \| * \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI	Jose Antonio Marquez	2012-06-12
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Adding temp prompt UI component	Jose Antonio Marquez	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close.
\| \| * \| \| \| \| \|