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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/ninja-internal-master' into FileIO	Ananya Sen	2012-02-29
\|\
\| *	Fix for double clicking in the resizer	Valerio Virgillito	2012-02-27
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Timeline : Reopening Doc has layer 1 default fix	Jonathan Duran	2012-02-27
\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	Timeline: RetrieveStoredTweens calling fixed	Jonathan Duran	2012-02-27
\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	Merge branch 'refs/heads/integration-candidate' into Timeline	Jonathan Duran	2012-02-27
\| \|\
\| \| *	removing the old settings class and disabling panel settings until the new ↵	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	clearing the old local setting and using the new version/prefix local settings.	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	prefixing the local storage and using the new local-storage object.	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'refs/heads/master' into local-storage-version	Valerio Virgillito	2012-02-24
\| \| \|\
\| \| * \	Merge branch 'refs/heads/master' into local-storage-version	Valerio Virgillito	2012-02-23
\| \| \|\ \
\| \| * \| \|	local storage integration and versioning	Valerio Virgillito	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Timeline : Selection Fix	Jonathan Duran	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Timeline: Order of tweens and corresponding layers taken care over	Jonathan Duran	2012-02-25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Timeline : Adding Tweens Properties	Jonathan Duran	2012-02-25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Timeline: Add grids to property tracks. First take on clearTimeline method ↵	Jon Reid	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on TimelinePanel class.
\| * \| \| \|	Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵	Jon Reid	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a layer, and fix serialization variable problem.
\| * \| \| \|	Merge remote-tracking branch 'ninja-internal/master' into Timeline-local	Jon Reid	2012-02-24
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge remote-tracking branch 'ninja-internal/master' into Timeline-local	Jon Reid	2012-02-23
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
\| * \| \| \|	Timeline: Add hottext fields to layers and serialize them throughout.	Jon Reid	2012-02-23
\| \| \| \| \|
\| * \| \| \|	add back layer selection	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Remove unneeded selection code	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Move element selection to click handler	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	handle selections for switching documents	Ananya Sen	2012-02-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \|	persist selections while switching documents	Ananya Sen	2012-02-28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \|	reverted null check as per request	Ananya Sen	2012-02-28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \|	persist undo/redo stack per html document	Ananya Sen	2012-02-27
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \|	Adding some missing copyrights	Valerio Virgillito	2012-02-24
\| \|/ / \|/\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Merge pull request #67 from ntfx47/PullRequest-Timeline	Valerio Virgillito	2012-02-23
\|\ \ \ \| \| \| \| \| \| \| \|	Timeline : Fix for the split and element model error
\| * \| \|	Timeline : Fix for the split and element model error	Kruti Shah	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \|	Fix to read back colors when re-opening files.	Nivesh Rajbhandari	2012-02-23
\| \|/ / \|/\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Remove selection calls from timelinepanel.js	Jonathan Duran	2012-02-23
\|/ / \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Fix for tween repetition arrays getting overwritten on file open	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Timeline: Reopen Doc Restore TimeLine	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	New Doc	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Timeline Track Open doc	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Timeline:Open Doc in TimelinePanel.js	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Timeline: Create new PropertyTrack subcomponent, and use it in the ↵	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Unterminated lines	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Redo timeline resize code	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Timeline Reset to clean Master branch. Code scrub.	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \|	Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \|	WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
* \|	Merge branch 'refs/heads/ninja-internal' into WebGLMaterials	Nivesh Rajbhandari	2012-02-22
\|\\|
\| *	Removing the timeline selection code.	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \|	Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \|	materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Updated Materials Library and Materials Editor Popup to work with latest ↵	mqg734	2012-02-21
\|/ \| \| \| \| \| \| \|	version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
*	Fixing the selectInput and finishing the textinput	Valerio Virgillito	2012-02-16
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-16
\|\
\| *	Presets Panel - Move to bottom, add to menu	Eric Guzman	2012-02-16
\| \|
\| *	Presets - Minor CSS text-shadow work-around for Windows Chrome	Eric Guzman	2012-02-16
\| \|