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

	Commit message (Collapse)	Author	Age
...
\| *	Merge branch 'refs/heads/ninja-internal' into WebGLMaterials	Nivesh Rajbhandari	2012-02-22
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #63 from dhg637/new-tool-icons	Valerio Virgillito	2012-02-22
\|\ \ \| \| \| \| \| \|	New tool icons
\| * \|	Removed Sass Cache	Armen Kesablyan	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	Removed Sass Cache	Armen Kesablyan	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	Merge branch 'refs/heads/master' into new-tool-icons	Armen Kesablyan	2012-02-22
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #62 from mayhewinator/WorkingBranch	Valerio Virgillito	2012-02-22
\|\ \ \ \| \| \| \| \| \| \| \|	Fix for bug that keeps Ninja from launching over HTTP....
\| * \| \|	Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ↵	John Mayhew	2012-02-22
\|/ / / \| \| \| \| \| \| \| \| \|	extension specific code in an if (window.chrome.app.isInstalled) check.
\| * \|	Added Shape Panel Icons	Armen Kesablyan	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	Tool Button Fixes	Armen Kesablyan	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	Tool Icons	Armen Kesablyan	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	New Icons: Last set had imperfections	Armen Kesablyan	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	Latest Montage Updates 0.6 Fixes	Armen Kesablyan	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	Tool Icons : New layout	Armen Kesablyan	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| *	Merge branch 'refs/heads/ToolFixes' into WebGLMaterials	Nivesh Rajbhandari	2012-02-22
\| \| \|\
\| \| \| *	Removing unused method that was using snapManager.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Integrating Zoom tool fixes.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-22
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \|
\| \| \| *	Fixing eyedropper tool to get color from image data. This required us to ↵	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Some more tweaks to not being able to select elements in top/side view.	Nivesh Rajbhandari	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	PulseMaterial and RadialBlurMaterial had typos in their import code.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@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>
\| \| * \|	Do not use color object for stage's border since we don't allow users to ↵	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	modify the stage's border; we only need the border-width. 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.
\| \| * \|	Color chips expect a color object, not a css value.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Merge branch 'refs/heads/ninja-internal' into WebGLMaterials	Nivesh Rajbhandari	2012-02-22
\| \| \|\ \ \| \|_\|/ / \|/\| \| \|
* \| \| \|	user document main reel listener moved to the html-document class.	Valerio Virgillito	2012-02-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \|	Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵	Valerio Virgillito	2012-02-21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	enabling nested selection	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	formatting and removing un-used code from the stage	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	cleanup	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Removing the log of the url requests	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	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>
\| * \| \| \|	Merge branch 'refs/heads/master' into nested-selection	Valerio Virgillito	2012-02-20
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'nested-selection' of github.com:mencio/ninja-internal into ↵	Valerio Virgillito	2012-02-20
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nested-selection
\| \| * \| \| \| \|	formatting cleanup	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	formatting cleanup	Valerio Virgillito	2012-02-20
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	cleanup of the breadcrumb	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \|	fixing the dirty flag and removing sass changes	Valerio Virgillito	2012-02-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \|	Merge pull request #13 from ananyasen/FileIO	Jose Antonio Marquez Russo	2012-02-21
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FileIO branch pull request
\| * \| \| \| \| \|	Revert "check cloud availability before open file picker and new file dialogs"	Ananya Sen	2012-02-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3251315ecc22544dab50623ee5862e00dfe02302. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/FileIO-jose' into FileIO	Ananya Sen	2012-02-20
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \|	Merge pull request #11 from ericguzman/StylesControllerUpdates	Jose Antonio Marquez Russo	2012-02-20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Styles controller updates
\| * \ \ \ \ \ \	Merge branch 'refs/heads/master' into StylesControllerUpdates	Eric Guzman	2012-02-20
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge pull request #57 from joseeight/CloudFix	Valerio Virgillito	2012-02-20
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cloud URL localStorage Fix
\| \| \| * \| \| \| \| \|	Cloud URL localStorage Fix	Jose Antonio Marquez	2012-02-20
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load.
\| * \| \| \| \| \| \|	Merge branch 'StylesControllerUpdates' of ↵	Eric Guzman	2012-02-20
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:ericguzman/ninja-internal into StylesControllerUpdates
\| \| * \| \| \| \| \| \|	Styles controller - Check for element's window object before querying for ↵	Eric Guzman	2012-02-20
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matching css rules.
\| * / / / / / /	Styles Controller -Fix invalid variable reference when looking for element's ↵	Eric Guzman	2012-02-20
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	window object
* \| \| \| \| \| \|	Clean up and repairing manifest	Jose Antonio Marquez	2012-02-19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #10 from ananyasen/FileIO	Jose Antonio Marquez Russo	2012-02-18
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	FileIO branch pull request