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

	Commit message (Collapse)	Author	Age
*	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration	hwc487	2012-02-22
\|\
\| *	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>
* \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-02-22
\|\ \ \ \| \| \|/ \| \|/\| \| \| \|	integration
\| * \|	enabling nested selection	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>
* \| \|	Adding bug fixes.	hwc487	2012-02-22
\| \|/ \|/\|
* \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-20
\|\\|
\| *	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>
\| *	Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵	Valerio Virgillito	2012-02-14
\| \|\ \| \| \| \| \| \| \| \| \|	integration
\| \| *	Merge branch 'refs/heads/master' into text-tool	Armen Kesablyan	2012-02-13
\| \| \|\
\| \| * \|	Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵	Armen Kesablyan	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and numbered now bound to text tool
\| * \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-10
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
\| * \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-09
\| \|\ \ \
\| * \ \ \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-09
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-08
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-06
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-02
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore js/ninja.reel/ninja.js
\| * \| \| \| \| \| \| \|	Merged old FileIO	Jose Antonio Marquez	2012-01-27
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \| \| \|	Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵	Valerio Virgillito	2012-02-09
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	feature-branch
\| * \| \| \| \| \|	More Text Tool Updates	Armen Kesablyan	2012-02-09
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	Armen Kesablyan	2012-02-07
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
\| * \| \| \| \| \|	Refactored rich text editor location	Armen Kesablyan	2012-02-07
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Initial Text tool completion.	Armen Kesablyan	2012-02-07
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Initial Text Tool Implementation	Armen Kesablyan	2012-02-02
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Has rich-text-editor in place need to place with finalized version when complete
* \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes	Nivesh Rajbhandari	2012-02-09
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-08
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
\| * \| \| \| \|	bug fixes for better anchor point rotation and removing snapping on hover ↵	Pushkar Joshi	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and mouse down
\| * \| \| \| \|	some minor bug fixes and code cleanup	Pushkar Joshi	2012-02-07
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-07
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool	Pushkar Joshi	2012-02-02
\| \|\ \ \ \ \
\| \| * \| \| \| \|	listen for the appMouseUp event in the Pan tool	hwc487	2012-02-01
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix for a marquee zoom bug.	hwc487	2012-02-01
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	mouse wheel for zoom tool	hwc487	2012-02-01
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	hwc487	2012-01-31
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/stage/stage.reel/stage.js
\| \| * \| \| \| \| \|	updated from old repo	hwc487	2012-01-27
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	avoid overriding GlGeomObj translate method	Pushkar Joshi	2012-02-01
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	handle the case of proper redraw when the alt key is held down even after ↵	Pushkar Joshi	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mouse up
\| * \| \| \| \| \|	display the anchor point to be selected on mouse hover	Pushkar Joshi	2012-01-31
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pushkar branch on gerritt with github version	Pushkar Joshi	2012-01-30
\| \|/ / / / /
* \| \| \| \| \|	Fixed runtime error when using 3d tools without any items selected.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \|	Merging fix for marquee selection that accounts for 3d values.	Nivesh Rajbhandari	2012-02-08
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \|	Merge pull request #21 from mencio/pi_bugs	Valerio Virgillito	2012-02-08
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Pi bugs fixes for 964, 616, 1084
\| * \| \| \| \|	IKNINJA - 1084: Fixing the custom tag.	Valerio Virgillito	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>