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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-28
\|\
\| *	FIX layer selection bug	Jonathan Duran	2012-06-28
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Fixing body background bug	Jose Antonio Marquez	2012-06-28
\| \|
* \|	Fixing init alpha issue	Jose Antonio Marquez	2012-06-28
\| \|
* \|	Fixing color panel sliders updating	Jose Antonio Marquez	2012-06-28
\| \|
* \|	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-28
\|\\|
\| *	Timeline: bug fix IKNINJA-1843	Jon Reid	2012-06-27
\| \|
* \|	Fixing history bug	Jose Antonio Marquez	2012-06-27
\| \|
* \|	Fixing IKNINJA-1634	Jose Antonio Marquez	2012-06-27
\| \|
* \|	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-27
\|\\|
\| *	Merge pull request #347 from mqg734/ComponentShapeToolBug	Valerio Virgillito	2012-06-27
\| \|\ \| \| \| \| \| \|	Temporarily disable ElementMediator's addDelegate when adding components.
\| \| *	Temporarily disable ElementMediator's addDelegate when adding components.	Nivesh Rajbhandari	2012-06-27
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Merge pull request #344 from mencio/google-components-fixes	Valerio Virgillito	2012-06-27
\| \|\ \ \| \| \| \| \| \| \| \|	Google components fixes
\| \| * \	Merge branch 'refs/heads/master' into google-components-fixes	Valerio Virgillito	2012-06-27
\| \| \|\ \
\| \| * \| \|	including the map icons inside the component and adding the empty category	Valerio Virgillito	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \|	Fixing minor color history bug	Jose Antonio Marquez	2012-06-27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-27
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #342 from imix23ways/Timeline-pullrequest	Valerio Virgillito	2012-06-27
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Timeline Bugfixes
\| \| * \ \ \	Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber	Jonathan Duran	2012-06-27
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Bug Fix : Hot Text change from the CSS panel	Kruti Shah	2012-06-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Fix live preview animation lock	Jonathan Duran	2012-06-27
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-06-27
\| \| \|\ \ \ \
\| \| \| * \ \ \	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-06-27
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Timeline: Bug fix: Hintable should work better now.	Jon Reid	2012-06-27
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-27
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \|
\| \| \| * \| \| \| \|	Fix animation names breaking	Jonathan Duran	2012-06-27
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Fix element getting stuck with live preview mode	Jonathan Duran	2012-06-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-27
\| \| \| \|\ \ \ \ \| \| \| \| \| \|_\|/ \| \| \| \| \|/\| \|
\| \| * \| \| \| \|	Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti	Kruti Shah	2012-06-27
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵	Kruti Shah	2012-06-27
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-06-27
\| \| \|\ \ \ \
\| \| \| * \| \| \|	FIx - hook up play button in timeline to live preview	Jonathan Duran	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Fix keyframe selection stickiness	Jonathan Duran	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-06-26
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	Timeline: Bug fix: Adding or splitting tweens on multiple layers at once	Jon Reid	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	will no longer change the selection.
\| \| \| \| * \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-06-26
\| \| \| \| \|\ \ \ \
\| \| \| \| * \| \| \| \|	Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,	Jon Reid	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	including splitting tweens.
\| \| \| * \| \| \| \| \|	Fix missing serialization in Layer.js	Jonathan Duran	2012-06-26
\| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-06-26
\| \| \| \|\\| \| \| \|
\| \| \| \| * \| \| \|	Timeline: Bug fix: Indexing on styles when loading files.	Jon Reid	2012-06-26
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-06-26
\| \| \| \| \|\ \ \ \
\| \| \| \| * \| \| \| \|	Timeline: Bug fix IKNINJA-1816	Jon Reid	2012-06-26
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix - deselect tweens when selecting a layer	Jonathan Duran	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-26
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|/ \| \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti	Kruti Shah	2012-06-27
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	Bug Fix: Fix Animation for Position & Size Props	Kruti Shah	2012-06-27
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \| \|	Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti	Kruti Shah	2012-06-26
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-06-26
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix sub prop tween selection to select main tween	Jonathan Duran	2012-06-26
\| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	Fix sub prop animations	Jonathan Duran	2012-06-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>