aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removing properties from Montage componentsValerio Virgillito2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified properties for the following components: - anchor - button - checkbox - image - number imput Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | removed trace statementValerio Virgillito2012-03-27
| | | | | | |