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

	Commit message (Collapse)	Author	Age
*	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.
\| *	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
\| \|\
\| * \|	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
\| \|\ \
\| * \ \	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-09
\| \|\ \ \
\| * \ \ \	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-03
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \ \ \ \	Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti	Kruti Shah	2012-07-03
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	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>
* \| \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	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>
* \| \| \| \| \| \|	Timeline: Delete unused file.	Jon Reid	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
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Timeline: Code refactor for Style.js	Jon Reid	2012-07-03
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-07-09
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \| \|	adding missing copyright to the feed reader.	Valerio Virgillito	2012-07-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	Merge pull request #373 from kriskowal/bsd	Valerio Virgillito	2012-07-06
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|	Update copyright boilerplate
\| \| * \| \| \| \|	Update copyright boilerplate	Kris Kowal	2012-07-06
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-07-03
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-03
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Timeline: Code refactor for Layer.js	Jon Reid	2012-07-03
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/timeline-local' into timeline-local	Jon Reid	2012-07-02
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js use mine; no idea why Git did this.
\| \| * \| \| \| \| \|	Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throws	Jon Reid	2012-07-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	error on console.
\| * \| \| \| \| \| \|	Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throws	Jon Reid	2012-07-02
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	error on console.
* \| \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-07-03
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	adding missing montage to the user library and temporary fix for picas ↵	Valerio Virgillito	2012-07-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	Merge pull request #369 from aadsm/gh-329_template-creator-restores-element	Valerio Virgillito	2012-07-03
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	gh-329 Make Template Creator restore the elements after serialization
\| \| * \| \| \| \|	gh-329 Make Template Creator restore the elements after serialization	António Afonso	2012-07-03
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \|	To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state.