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

	Commit message (Collapse)	Author	Age
...
\| \| * \| \|	Revert "Merging TextDocument into BaseDocument"	Ananya Sen	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \|	Revert "Cleaning up"	Ananya Sen	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \|	Revert "Reverting text/html document classes and setting up MVC folder ↵	Ananya Sen	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \|	Revert "Creating NinjaTemplate to HTML function"	Ananya Sen	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@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.
* \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-20
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #55 from mencio/nested-selection	Valerio Virgillito	2012-02-17
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|	Re-adding stage mouse wheel scrolling
\| \| * \| \|	Re-adding stage mouse wheel scrolling	Valerio Virgillito	2012-02-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Merge pull request #54 from joseeight/TabPreview	Valerio Virgillito	2012-02-17
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Tab preview
\| \| * \ \ \	Merge branch 'refs/heads/NinjaInternal' into TabPreview	Jose Antonio Marquez	2012-02-17
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #53 from joseeight/FileIO	Valerio Virgillito	2012-02-17
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File IO local files webRequest redirect
\| \| \| * \| \| \|	Chrome Preview	Jose Antonio Marquez	2012-02-17
\| \| \|/ / / /
\| \| * \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-17
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'refs/heads/stage-matrix-issue'	Valerio Virgillito	2012-02-17
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Merge pull request #52 from mencio/stage-matrix-fix	Valerio Virgillito	2012-02-16
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixing the getStageWorldToGlobalMatrix bug
\| \| \| * \| \|	Fixing the getStageWorldToGlobalMatrix bug	Valerio Virgillito	2012-02-16
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \|	Adding webRequest redirects for iFrame templates	Jose Antonio Marquez	2012-02-17
\| \| \| \| \|
\| \| \| * \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-17
\| \| \| \|\ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	fixed typo	Valerio Virgillito	2012-02-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	initial commit of the Ninja readme file	Valerio Virgillito	2012-02-17
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Adding Chrome webRequest intercept	Jose Antonio Marquez	2012-02-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Need to add logic to resolve file's actual URL dynamically.
\| \| * \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-16
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #51 from mencio/components	Valerio Virgillito	2012-02-16
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fixing the components not instantianting in the user document
\| \| * \| \|	Fixing the selectInput and finishing the textinput	Valerio Virgillito	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	Fixing the component loading error.	Valerio Virgillito	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing the deserializedFromTemplate which was causing the component not to load. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-16
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #50 from mencio/canvas-data	Valerio Virgillito	2012-02-16
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Adding canvas data attributes
\| \| * \| \| \|	Adding a data-RDGE-id attribute to each canvas to save/load canvas data	Valerio Virgillito	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	Support for data attributes and adding a random string generator	Valerio Virgillito	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	Merge pull request #49 from mayhewinator/WorkingBranch	mayhewinator	2012-02-16
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated manifest.json to use our internal update server for daily builds
\| \| * \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-02-16
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch
\| \| * \| \| \| \|	Updated the update url in our manifest file to point to our internal server.	John Mayhew	2012-02-16
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-15
\| \| \| \| \|\ \ \
\| \| \| \| * \| \| \|	Adding more components pi	Valerio Virgillito	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added rest of the components pi. Missing text-input and select Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	Adding the button and the dropdown control.	Valerio Virgillito	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	fixing the controller to handle all properties	Valerio Virgillito	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	Completing the anchor element	Valerio Virgillito	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	Adding all the components to the panel	Valerio Virgillito	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	Removing the old and obsolete ninja components	Valerio Virgillito	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-14
\| \| \| \| \|\ \ \ \
\| \| \| \| \| \| \| * \|	Moving Ninja iFrame templates	Jose Antonio Marquez	2012-02-16
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-16
\| \| \| \| \| \| \| \|\ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixing the preset panel undefined property for the menu model.	Valerio Virgillito	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| \| \| \| * \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-16
\| \| \| \| \| \| \| \|\ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #46 from ericguzman/PresetsPanel	Valerio Virgillito	2012-02-16