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

	Commit message (Collapse)	Author	Age
*	- added closeDocument event for timeline	Ananya Sen	2012-02-24
\| \| \| \| \| \|	- minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	- added flag for timeline to identify new file flow	Ananya Sen	2012-02-24
\| \| \| \| \| \|	- added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	Merge branch 'refs/heads/FileIO-jose' into FileIO	Ananya Sen	2012-02-23
\|\
\| *	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-23
\| \|\
\| \| *	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>
\| \| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-02-23
\| \| \|\ \
\| \| * \| \|	Fixing the selection tool properties icons.	Valerio Virgillito	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Merge pull request #17 from ericmueller/integration	Jose Antonio Marquez Russo	2012-02-23
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Integration
\| \| * \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-02-23
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
\| \| * \| \| \|	GL save and reload.	hwc487	2012-02-22
\| \| \| \| \| \|
\| \| * \| \| \|	Runtime classes	hwc487	2012-02-22
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration	hwc487	2012-02-22
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-02-22
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration
\| \| * \| \| \| \| \|	Added all materials back in	hwc487	2012-02-22
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Adding all the shaders back in	hwc487	2012-02-22
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Adding bug fixes.	hwc487	2012-02-22
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into ↵	hwc487	2012-02-21
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration
\| * \| \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-23
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge pull request #65 from mqg734/NiveshColor	Valerio Virgillito	2012-02-23
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|	Fix to read back colors when re-opening files.
\| \| \| * \| \| \| \| \|	Fix to read back colors when re-opening files.	Nivesh Rajbhandari	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-23
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/document-controller.js
\| \| * \| \| \| \| \| \|	Fixing app mode check.	Valerio Virgillito	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \| \|	fixing the tools shortcuts - IKNINJA 1199	Valerio Virgillito	2012-02-23
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Merge pull request #64 from imix23ways/Timeline	Valerio Virgillito	2012-02-23
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Timeline
\| \| \| * \| \| \| \| \|	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>
\| * \| \| \| \| \|	Fixing document mode check	Jose Antonio Marquez	2012-02-23
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	refresh draw-utils, snap-manager, view-utils for html document stitching	Ananya Sen	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/FileIO-jose' into FileIO	Ananya Sen	2012-02-23
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-23
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Fixing the breadcrumb button - removing toolbutton class since it is not a ↵	Valerio Virgillito	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \|	Merge pull request #60 from mqg734/WebGLMaterials	Valerio Virgillito	2012-02-23
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
\| \| \| * \| \| \| \|	Updating textfield to only use nj-skinned class and updating input-group to ↵	Nivesh Rajbhandari	2012-02-22
\| \|