aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
|\
| * 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
| | * | 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>
| * | | 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 pull request #162 from mqg734/BoundsCalculationValerio Virgillito2012-04-12
| |\ \ \ \ | | | |/ / | | |/| | offsets should be calculated on offsetParent instead of parentElement.
| | * | | Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Borders are not factored into offset calculations by the browser, so we have ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-04-11
| |/ / / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge pull request #161 from mqg734/PerspectiveFixValerio Virgillito2012-04-11
| |\ \ \ | | |/ / | |/| | IKNinja-812 - Perspective fix
| | * | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\ \ \ | | | | | | | | | | 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
| * \ \ \ Merge pull request #160 from ananyasen/integration-candidateValerio Virgillito2012-04-09
| |\ \ \ \ | | | | | | | | | | | | - using Montage TextField component to handle all edits
| | * | | | block filenames and directories with all spaceAnanya Sen2012-04-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Ananya Sen2012-04-06
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | bug-fixes
| * | | | | Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
| |\ \ \ \ \ | | | | | | | | | | | | | | Presets controller - update for "_element" removal in selection objects
| | * \ \ \ \ Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| | |\ \ \ \ \
| | * | | | | | Presets Controller - Update to not use "_element" property of selection.Eric Guzman2012-04-04
| | | | | | | |
| * | | | | | | Merge pull request #158 from ananyasen/integration-candidateValerio Virgillito2012-04-05
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | - disable ok when text box is cleared using backspace and cross, for fil...
| * \ \ \ \ \ \ \ Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Components panel cleanup and displaying only simple properties.
| | * | | | | | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | removing some of the button propertiesValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | Merge branch 'components' of github.com:mencio/ninja-internal into componentsValerio Virgillito2012-03-30
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/components-data/toggle-button.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | | | | completing the component simple piValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | completing the component simple piValerio Virgillito2012-03-30
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | |