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

	Commit message (Collapse)	Author	Age
...
*	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
\| *	montage v10 serialization updates for timeline	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@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>
\| *	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>
\| \| *	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>
\| * \|	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>
* \| \|	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>
\| * \| \|	changes to reopen sub property functions	Jonathan Duran	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \|	Fix references to documentController.activeDocument to currentDocument.model	Jonathan Duran	2012-06-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \|	Fix error when opening file with no animations	Jonathan Duran	2012-06-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \|	Timeline: Merge branch 'pull-request' into timeline-local	Jon Reid	2012-06-05
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
\| \| * \|	Timeline: Fix line endings, set to UNIX.	Jon Reid	2012-06-05
\| \| \| \|
\| \| * \|	Timeline: Fixes to timeline to handle document switching & breadcrumb	Jon Reid	2012-06-04
\| \| \|/ \| \| \| \| \| \| \| \| \|	interactions under new DOM Architecture.
\| * \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-06-05
\| \|\ \
\| \| * \|	Timeline: Better style selection and deselection. Automatic re-selection of	Jon Reid	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	previously selected style when parent layer is reselected.
\| \| * \|	Timeline: Bug fixes for deleting styles and their associated tracks	Jon Reid	2012-05-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correctly.
\| * \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-05
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| *	fixing the timeline current document bindings	Valerio Virgillito	2012-05-30
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	document bindings phase 1	Valerio Virgillito	2012-05-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Sub Props	Kruti Shah	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	Color chip in TP	Kruti Shah	2012-06-08
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	Sub property	Kruti Shah	2012-06-07
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	LC	Kruti Shah	2012-06-04
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	LayerControl	Kruti Shah	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	Clean up	Kruti Shah	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	Layer Controls	Kruti Shah	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	Color Chip	Kruti Shah	2012-05-31
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \|	Merge branch 'refs/heads/TimelineUberjd' into TimelineUber	Kruti Shah	2012-05-31
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \|	fix doc model in prop track	Jonathan Duran	2012-05-31
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>