aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Moving initialzeSnapping routine from RotateObject3DTool tool to ↵Nivesh Rajbhandari2012-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 EricMergeNivesh Rajbhandari2012-04-18
|\
| * Squashed commit of the following:Valerio Virgillito2012-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>
* | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-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/WebGLFixesValerio Virgillito2012-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 Rajbhandari2012-04-17
| | | | | | | | | | | | | | | | | | be set as attributes instead of styles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-17
| | |\ | | |/ | |/|
| * | Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\ \ | | | | | | | | Drag and drop of images and components should not add 3d values by default
| * \ \ Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-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 Rajbhandari2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PaintBucket, InkBottle and Eyedropper tools. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge pull request #163 from mencio/undo-managerValerio Virgillito2012-04-17
| |\ \ \ \ | | |/ / / | |/| | | Undo manager - Fixing a couple undo bugs and architecture work to support undo/redo
| | * | | Fixing the shape borderValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | collapsing the history panel by default and commenting out the undo for the ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixed stage rotationValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | clear console logValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | CleanupValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing the transform handlesValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | removing _undo array and _targets array and use object instead of matching ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | some code cleanupValerio Virgillito2012-04-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | setProperties to the montage undo/redoValerio Virgillito2012-04-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | adding a history panelValerio Virgillito2012-04-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.Nivesh Rajbhandari2012-04-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-16
| | | | |\ | | |_|_|/ | |/| | |
| | | | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-13
| | | | |\
| | | | * \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-13
| | | | |\ \
* | | | | \ \ Merge branch 'refs/heads/Snapping_II' into EricMergeNivesh Rajbhandari2012-04-18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Allow snapping to unselected objectshwc4872012-04-17
| | | | | | |
| * | | | | | snapping for stage rotation toolhwc4872012-04-16
| | | | | | |
| * | | | | | 3D translation fixeshwc4872012-04-16
| | | | | | |
| * | | | | | 3D rotationhwc4872012-04-13
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-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/BoundsCalculationValerio Virgillito2012-04-12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | offsets should be calculated on offsetParent instead of parentElement.
| * | | | | | | 3D Rotate changeshwc4872012-04-13
| | | | | | | |
| * | | | | | | Rotate3D tool changeshwc4872012-04-11
| | | | | | | |
| * | | | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into ↵hwc4872012-04-05
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II
| | * | | | | | | translate3DObject tool fixes.hwc4872012-04-05
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-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.hwc4872012-04-04
| | | | | | | | | |
| | * | | | | | | | turned off translation handles during a multi-object drag.hwc4872012-04-04
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-03
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping
| | * | | | | | | | | Translate 3D fix for multi-selection Z translationhwc4872012-04-02
| | | | | | | | | | |
* | | | | | | | | | | Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |