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

	Commit message (Collapse)	Author	Age
*	Timeline: Replace currentSelectedContainer with new model.domContainer.	Jon Reid	2012-06-15
\|
*	Merge remote-tracking branch 'ninja-internal/master' into test-merge	Jon Reid	2012-06-15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
\| *	Fix: IKNINJA-1608	Jose Antonio Marquez	2012-06-13
\| \| \| \| \| \| \| \|	Changing icon, seems low res and improper size, should be hi-res PNG for future reference, using negative space offset to better display.
\| *	Clean up	Jose Antonio Marquez	2012-06-13
\| \|
\| *	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-12
\| \| \|\
\| \| * \|	remove serializable from custom section	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
\| \| \| * \|	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>
\| \| * \|	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>
\| \| * \|	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>
\| * \| \| \| \|	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
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	Merge pull request #289 from mqg734/PI_Global3d	Valerio Virgillito	2012-06-12
\| \| \|\ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|	IKNinja-1377 - Global rotation does not work if object is translated in z.
\| \| \| * \| \|	Fixing typo.	Nivesh Rajbhandari	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \|	Removing unused requires from 3d PI section.	Nivesh Rajbhandari	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \|	IKNinja-1377 - Global rotation does not work if object is translated in z.	Nivesh Rajbhandari	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \|	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>
\| * \| \| \|	Merge branch 'refs/heads/master' into dom-container	Valerio Virgillito	2012-06-11
\| \|\\| \| \|
\| * \| \| \|	rewrite: currentSelectedContainer -> domContainer	Valerio Virgillito	2012-06-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \|	Remove obsolete absolute/relative options from timeline config menu	Jonathan Duran	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	Hide timeline zoom slider temporarily	Jonathan Duran	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	remove console logs	Jonathan Duran	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	Fix sub prop re-open for tweens	Jonathan Duran	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	F6 support for keyframes	Jonathan Duran	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	Timeline: fix serialization error.	Jon Reid	2012-06-14
\| \| \| \| \|
* \| \| \| \|	Timeline: New easing menu.	Jon Reid	2012-06-14
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into new-easing-menu	Jon Reid	2012-06-14
\|\ \ \ \ \
\| * \| \| \| \|	Fix the broken animation	Kruti Shah	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \| \| \|	Timeline: More work on new easing menu.	Jon Reid	2012-06-13
\| \| \| \| \| \|
* \| \| \| \| \|	Timeline: New popup menu for easing choices.	Jon Reid	2012-06-12
\|/ / / / /
* \| \| \| \|	Clean up	Kruti Shah	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \| \|	Merge branch 'refs/heads/TimelineUberjd' into TimelineUber	Kruti Shah	2012-06-12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \|	remove unneeded serialization	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \|	montage v10 serialization updates for timeline	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \|	remove some console logs and simply the prop tween retrieval conditions	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \|	Squashed commit of the following:	Jonathan Duran	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 8e98ce012f55576ddb979969a3a1d834301af0c7 Author: Jon Reid <tjh487@motorola.com> Date: Fri Jun 8 18:08:38 2012 -0700 Timeline: New feature: Only one easing menu can be open at a time. Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-11
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2	Valerio Virgillito	2012-06-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	Merge branch 'refs/heads/master' into timeline-resizer-fix	Valerio Virgillito	2012-06-08
\| \| \|\\| \| \|