aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-16
|\
| * Merge pull request #162 from mqg734/BoundsCalculationValerio Virgillito2012-04-12
| |\
| | * Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| | * Borders are not factored into offset calculations by the browser, so we have ...Nivesh Rajbhandari2012-04-12
| | * offsets should be calculated on offsetParent instead of parentElement.Nivesh Rajbhandari2012-04-11
| |/
| * Merge pull request #161 from mqg734/PerspectiveFixValerio Virgillito2012-04-11
| |\
| | * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
| | |\ | | |/ | |/|
| * | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\ \
| * \ \ Merge pull request #160 from ananyasen/integration-candidateValerio Virgillito2012-04-09
| |\ \ \
| | * | | block filenames and directories with all spaceAnanya Sen2012-04-06
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into bug...Ananya Sen2012-04-06
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
| |\ \ \ \
| | * \ \ \ 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
| |\ \ \ \ \ \ \
| | * | | | | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | * | | | | | | 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
| | * | | | | | | | Merge branch 'components' of github.com:mencio/ninja-internal into componentsValerio Virgillito2012-03-30
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | completing the component simple piValerio Virgillito2012-03-30
| | * | | | | | | | | completing the component simple piValerio Virgillito2012-03-30
| | |/ / / / / / / /
| | * | | | | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | * | | | | | | | 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
| | * | | | | | | | | | removed trace statementValerio Virgillito2012-03-27
| | * | | | | | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
| | | | | | | | | * | | - using Montage TextField component to handle any edits like keyup, paste, cut.Ananya Sen2012-04-05
| | | | | | | | |/ / / | | | | | | | |/| | |
| | | | | | | * | | | - disable ok when text box is cleared using backspace and cross, for file nam...Ananya Sen2012-04-04
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1Valerio Virgillito2012-04-04
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | | |_|_|/ / / / | | |/| | | | | |
| | | | | | | | * Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | | |/
| | | | | | | * Grow/shrink Line, Oval and Rectangles when changing stroke size.Nivesh Rajbhandari2012-04-06
| | | | | | | * -webkit-transform-style needs to be set to preserve-3d for shapes regardless ...Nivesh Rajbhandari2012-04-05
| | | | | | | * Fix for line tool not working because PI requests fill color for line as well...Nivesh Rajbhandari2012-04-05
| | | | | | | * Updated canvas-runtime.js to support gradients for rectangle and oval in canv...Nivesh Rajbhandari2012-04-05
| | | | | | | * Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca...Nivesh Rajbhandari2012-04-05
| | | | | | | * Fixing 3d tool reset to redraw handles.Nivesh Rajbhandari2012-04-05
| | | | | | | * Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
| | | | | | | * Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | | | | | | * Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | * Changing .default to ["default"] to avoid WebStorm errors.Nivesh Rajbhandari2012-04-05
| | | | | | | * Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | * Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | * Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| | | | | | | * Commenting out console logs.Nivesh Rajbhandari2012-04-05
| | | | | | | * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| | | | | | | |\
| | | | | | | | * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | | | | | | | |\