ninja - [ARCHIVED 2012] An HTML5 web app content authoring tool

	Commit message (Collapse)	Author	Age
*	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 pull request #166 from mqg734/WebGLFixes	Valerio Virgillito	2012-04-17
\| \|\ \| \| \| \| \| \|	IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.
\| \| *	Adding back setProperties for canvas because width and height values need to ↵	Nivesh Rajbhandari	2012-04-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	be set as attributes instead of styles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-04-17
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #165 from mqg734/BoundsCalculation	Valerio Virgillito	2012-04-17
\| \|\ \ \| \| \| \| \| \| \| \|	Drag and drop of images and components should not add 3d values by default
\| * \ \	Merge pull request #164 from mqg734/ToolTipFixes	Valerio Virgillito	2012-04-17
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for PaintBucket, InkBottle and Eyedropper tools.
\| \| * \| \|	IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ↵	Nivesh Rajbhandari	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PaintBucket, InkBottle and Eyedropper tools. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Merge pull request #163 from mencio/undo-manager	Valerio Virgillito	2012-04-17
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Undo manager - Fixing a couple undo bugs and architecture work to support undo/redo
\| \| * \| \|	Fixing the shape border	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	collapsing the history panel by default and commenting out the undo for the ↵	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3d properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	fixed stage rotation	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	clear console log	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	Cleanup	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	fixing the transform handles	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	removing _undo array and _targets array and use object instead of matching ↵	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	Merge branch 'refs/heads/master' into undo-manager	Valerio Virgillito	2012-04-12
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	some code cleanup	Valerio Virgillito	2012-04-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	setAttribute added to the undo/redo	Valerio Virgillito	2012-04-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	setProperties to the montage undo/redo	Valerio Virgillito	2012-04-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	adding a history panel	Valerio Virgillito	2012-04-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| *	IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.	Nivesh Rajbhandari	2012-04-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| *	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-04-16
\| \| \| \| \|\ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| \| \| *	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-03-13
\| \| \| \| \|\
\| \| \| \| * \	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-03-13
\| \| \| \| \|\ \
* \| \| \| \| \ \	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
\| \| * \| \| \| \|	Merge pull request #162 from mqg734/BoundsCalculation	Valerio Virgillito	2012-04-12
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	offsets should be calculated on offsetParent instead of parentElement.
\| * \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Drag and drop of images and components should not add 3d values by default.	Nivesh Rajbhandari	2012-04-16
\| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \| \|	Fixing selection/tag layout drawing when canvas and image elements have borders.	Nivesh Rajbhandari	2012-04-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \| \|	Borders are not factored into offset calculations by the browser, so we have ↵	Nivesh Rajbhandari	2012-04-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to adjust for them. Also, we should set webkit-transform-style to preserve-3d if elements are rotated (until we also support flattened mode). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \| \|	offsets should be calculated on offsetParent instead of parentElement.	Nivesh Rajbhandari	2012-04-11
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \|	Merge pull request #161 from mqg734/PerspectiveFix	Valerio Virgillito	2012-04-11
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	IKNinja-812 - Perspective fix