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

	Commit message (Collapse)	Author	Age
*	upgrading the manifest back to v0.8.0	Valerio Virgillito	2012-07-18
\| \| \| \| \| \|	Manifest got overridden by the last merge. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge branch 'refs/heads/master' into v0.7.1	Valerio Virgillito	2012-07-18
\|\
\| *	Update Readme.md to add info on Local Cloud settings to support installing ↵	San Khong	2012-07-18
\| \| \| \| \| \| \| \|	multiple builds of Ninja.
* \|	fixing the copyrights on the timeline branch pull request.	Valerio Virgillito	2012-07-18
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1	Valerio Virgillito	2012-07-18
\|\ \
\| * \|	Merge branch 'refs/heads/NINJA-master' into TimelineUber	Jonathan Duran	2012-07-18
\| \|\\|
\| * \|	Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber	Jonathan Duran	2012-07-17
\| \|\ \
\| \| * \|	Multi Doc Zoom Slider Handling	Kruti Shah	2012-07-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-17
\| \| \|\ \
\| * \| \ \	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-17
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge branch 'refs/heads/NINJA-master' into TimelineUber	Jonathan Duran	2012-07-17
\| \| \|\ \ \
\| * \| \| \| \|	Timeline: Possible fix for new file/new style crash problem.	Jon Reid	2012-07-17
\| \|/ / / /
\| * \| \| \|	Timeline: Style zoom slider.	Jon Reid	2012-07-17
\| \| \| \| \|
\| * \| \| \|	Timeline: Bug fix: Now able to add first keyframe to an element using	Jon Reid	2012-07-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	function key.
\| * \| \| \|	Merge branch 'refs/heads/NINJA-master' into TimelineUber	Jonathan Duran	2012-07-17
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-16
\| \|\ \ \ \
\| \| * \| \| \|	Timeline: Ameliorate slowness when adding first keyframe to an element.	Jon Reid	2012-07-16
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-16
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Resolved by using both; both were needed.
\| \| * \| \| \| \|	Timeline: Disable drag-and-drop on subproperty keyframes. Better error	Jon Reid	2012-07-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handling. Fix some minor bugs.
\| \| * \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-11
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-09
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Timeline: Delete unused file.	Jon Reid	2012-07-09
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug ↵	Kruti Shah	2012-07-16
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \| \| \|	Zooming the tweens	Kruti Shah	2012-07-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-11
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Fix layer array	Jonathan Duran	2012-07-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \|	Fix more missing char	Jonathan Duran	2012-07-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \|	Fix missing char and Temp fix missing image	Jonathan Duran	2012-07-10
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \| \|	Adding Zoom Control to Property Tracks	Kruti Shah	2012-07-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-09
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	remove commas from var lines	Jonathan Duran	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode	Kruti Shah	2012-07-09
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Adding comments	Kruti Shah	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Refactoring Code	Kruti Shah	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Remove Comment	Kruti Shah	2012-07-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode	Kruti Shah	2012-07-03
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \ \ \ \ \	Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCode	Kruti Shah	2012-07-03
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Refactor Code + Bug Fix for the Colorchip disappear between breadcrumb ↵	Kruti Shah	2012-07-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	navigation Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \| \| \|	Refactoring PropertyTrack.js & Span.js	Kruti Shah	2012-07-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-09
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-07-09
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \| \| \|	Timeline: First pass at cleaning up TimelineTrack code. Changes propagated	Jon Reid	2012-07-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to PropertyTrack, TimelineTrack, and Tween classes.
\| \| \| * \| \| \| \| \| \|	Timeline: Refactor style and layer to use pointers to parent components.	Jon Reid	2012-07-03
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-03