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

	Commit message (Collapse)	Author	Age
*	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check for nj-skinned class instead of textfield class for styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Adding back the local storage check in the cloudpopup.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Buttons in the rectangle properties in the tools options need to float left.	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
\| \| \| \|\ \| \| \| \|/ \| \| \|/\|
\| \| \| *	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
\| \| \| \|\ \ \ \| \| \| \| \| \|/ \| \| \| \| \|/\|
\| \| \| * \| \|	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
\| \| \| \|\ \
\| \| \| * \| \|	Fix for not being able to select an element in Top/Side view.	Nivesh Rajbhandari	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to use SnapManager code if elementFromPoint returns the viewport. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-14
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Get color under mouse point from image or canvas.	Nivesh Rajbhandari	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \|	Get color from canvas and images.	Nivesh Rajbhandari	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-14
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Check if eyedropper is over border or background.	Nivesh Rajbhandari	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Fixed issue with tools not drawing their handles when mousing up.	Nivesh Rajbhandari	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Working around inconsistent color object when getting/setting WebGL values.	Nivesh Rajbhandari	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Fixed eyedropper tool to use new color routines.	Nivesh Rajbhandari	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Updated ink bottle tool to use new setColor routine in the mediator and ↵	Nivesh Rajbhandari	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \|	Adding url clean up to HTML on save	Jose Antonio Marquez	2012-02-23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #18 from mencio/file-io	Jose Antonio Marquez Russo	2012-02-23
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File io - drawing the layout on open and make models
\| \| * \ \ \ \ \ \	Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-io	Valerio Virgillito	2012-02-23
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Temp fix for CSS url data	Jose Antonio Marquez	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a temp fix to parse out the app url that is placed in the CSS styles.
\| * \| \| \| \| \| \| \|	App mode checking fix	Jose Antonio Marquez	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a way to check for the app to be served over http/https to prevent from adding webRequest events on app load.
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-22
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Cleaning up and commenting CSS IO	Jose Antonio Marquez	2012-02-22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Logic to save <style> for a file	Jose Antonio Marquez	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Saving CSS in <style> tags, need to implement saving CSS to files.
\| * \| \| \| \| \| \| \|	Merge pull request #16 from ananyasen/FileIO	Jose Antonio Marquez Russo	2012-02-22
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FileIO branch pull request
\| * \| \| \| \| \| \| \| \|	Removed css not needed in Ninja Template	Jose Antonio Marquez	2012-02-22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #15 from mencio/file-io	Jose Antonio Marquez Russo	2012-02-22
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	moving the default folder location to the navigator to fix the ok button issue
\| \| \| \| \| * \| \| \| \| \|	renaming makeElementModel2 to makeModelFromElement	Valerio Virgillito	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|</