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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/NINJA-master' into TimelineUber	Jonathan Duran	2012-07-20
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	Timeline: updated livePreview to timeline play. Hide canvas and draw red outline	Valerio Virgillito	2012-07-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Improve keyframe selection by moving playhead marker to lower z-index	Jonathan Duran	2012-07-19
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	FIx 3D animation workflow	Jonathan Duran	2012-07-19
\| \| \| \| \| \| \| \| \| \| \| \|	Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber	Jonathan Duran	2012-07-19
\|\ \ \| \|/ \|/\|
\| *	The zoom slider position remembered between multi doc switch	Kruti Shah	2012-07-18
\| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \|	fixing the copyrights on the timeline branch pull request.	Valerio Virgillito	2012-07-18
\|/ \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	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>
* \|	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>
\| *	fixed incorrect capitalization for DOCTYPE html	John Mayhew	2012-07-09
\| \|
\| *	Normalize HTML DOCTYPE	Kris Kowal	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
\| *	BSD License	Kris Kowal	2012-07-09
\| \|
\| *	Normalize HTML doctype	Kris Kowal	2012-07-06
\| \|
\| *	Remove byte order markers (BOM)	Kris Kowal	2012-07-06
\| \|
\| *	Remove trailing spaces	Kris Kowal	2012-07-06
\| \|
\| *	Remove trailing spaces	Kris Kowal	2012-07-06
\| \|
\| *	Expand tabs	Kris Kowal	2012-07-06
\| \|
* \|	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>
* \| \|	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>
\| * \|	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>
\| \| * \|	Update copyright boilerplate	Kris Kowal	2012-07-06
\| \| \| \|
\| \| * \|	Timeline: Better deselection of tweens when selecting/deselecting layers.	Jon Reid	2012-06-28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section)
* \| \| \|	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/timeline-local' into TimelineUber	Jonathan Duran	2012-07-03
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|