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

	Commit message (Collapse)	Author	Age
*	IKNINJA-1529 : zooming such that cursor position can be calculated accurately	Ananya Sen	2012-04-24
\| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	IKNINJA-1530 : turned off autocompletion and just kept the code hinting	Ananya Sen	2012-04-24
\| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	IKNINJA-1529 : zooming to fix font overlap issue	Ananya Sen	2012-04-23
\| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	IKNINJA-1528 : temporarily disabling active line color for this	Ananya Sen	2012-04-23
\| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	fixed ugly scroll coming in the middle of the page for a short file	Ananya Sen	2012-04-23
\| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements	Ananya Sen	2012-04-23
\|\
\| *	Merge branch 'refs/heads/master' into cleanup	Valerio Virgillito	2012-04-19
\| \|\
\| \| *	Merge pull request #168 from mqg734/EricMerge	Valerio Virgillito	2012-04-19
\| \| \|\ \| \| \| \| \| \| \| \|	Merging Eric's snapping and tool fixes into master.
\| \| \| *	Moving initialzeSnapping routine from RotateObject3DTool tool to ↵	Nivesh Rajbhandari	2012-04-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rotate3DToolBase so Rotate Stage uses the same code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Merge branch 'refs/heads/ninja-internal' into EricMerge	Nivesh Rajbhandari	2012-04-18
\| \| \| \|\
\| \| \| * \|	Fixing some more merge issues.	Nivesh Rajbhandari	2012-04-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Merge branch 'refs/heads/ninja-internal' into EricMerge	Nivesh Rajbhandari	2012-04-18
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \ \	Merge branch 'refs/heads/Snapping_II' into EricMerge	Nivesh Rajbhandari	2012-04-18
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Allow snapping to unselected objects	hwc487	2012-04-17
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	snapping for stage rotation tool	hwc487	2012-04-16
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	3D translation fixes	hwc487	2012-04-16
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	3D rotation	hwc487	2012-04-13
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-13
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snapping_II Conflicts: js/helper-classes/3D/view-utils.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js js/tools/Translate3DToolBase.js
\| \| \| \| * \| \| \|	3D Rotate changes	hwc487	2012-04-13
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Rotate3D tool changes	hwc487	2012-04-11
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into ↵	hwc487	2012-04-05
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snapping_II
\| \| \| \| \| * \| \| \|	translate3DObject tool fixes.	hwc487	2012-04-05
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-04
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snapping Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
\| \| \| \| \| * \| \| \| \|	Cap fix for vecUtils.	hwc487	2012-04-04
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	turned off translation handles during a multi-object drag.	hwc487	2012-04-04
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-03
\| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snapping
\| \| \| \| \| * \| \| \| \| \|	Translate 3D fix for multi-selection Z translation	hwc487	2012-04-02
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge pull request #167 from mqg734/BoundsCalculation	Valerio Virgillito	2012-04-18
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|	Grid should redraw on elementChanging as well as elementChange.
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into AllFixes	Nivesh Rajbhandari	2012-04-17
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Grid should redraw on elementChanging as well as elementChange.	Nivesh Rajbhandari	2012-04-17
\| \| \| \| \|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| / \| \| \| \| \| \| \|	cleanup unused code.	Valerio Virgillito	2012-04-19
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \| /	Squashed commit of the following:	Valerio Virgillito	2012-04-18
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \|	set editor background color as per the selected theme	Ananya Sen	2012-04-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \| \|	- disable autocompletion option for unsupported file type	Ananya Sen	2012-04-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \| \|	- fixed the text cursor	Ananya Sen	2012-04-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- code cleanup Signed-off-by: A