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 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>
* \| \| \| \| \| \|	local storage integration and versioning	Valerio Virgillito	2012-02-22
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \|