aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #167 from mqg734/BoundsCalculationValerio Virgillito2012-04-18
|\
| * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-17
| |\
| * | Grid should redraw on elementChanging as well as elementChange.Nivesh Rajbhandari2012-04-17
* | | Squashed commit of the following:Valerio Virgillito2012-04-18
* | | Merge pull request #166 from mqg734/WebGLFixesValerio Virgillito2012-04-17
|\ \ \ | |_|/ |/| |
| * | Adding back setProperties for canvas because width and height values need to ...Nivesh Rajbhandari2012-04-17
| * | 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.Nivesh Rajbhandari2012-04-16
* | | Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-04-17
|\ \ \
| * | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ...Nivesh Rajbhandari2012-04-13
* | | | Merge pull request #163 from mencio/undo-managerValerio Virgillito2012-04-17
|\ \ \ \ | |/ / / |/| | |
| * | | Fixing the shape borderValerio Virgillito2012-04-13
| * | | collapsing the history panel by default and commenting out the undo for the 3...Valerio Virgillito2012-04-13
| * | | fixed stage rotationValerio Virgillito2012-04-13
| * | | clear console logValerio Virgillito2012-04-13
| * | | CleanupValerio Virgillito2012-04-13
| * | | fixing the transform handlesValerio Virgillito2012-04-13
| * | | removing _undo array and _targets array and use object instead of matching ar...Valerio Virgillito2012-04-13
| * | | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
| |\ \ \ | |/ / / |/| | |
| * | | some code cleanupValerio Virgillito2012-04-10
| * | | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| * | | setProperties to the montage undo/redoValerio Virgillito2012-04-09
| * | | adding a history panelValerio Virgillito2012-04-09
| | | * IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.Nivesh Rajbhandari2012-04-17
| | | * 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
| |\ \ \ \ \ \ \ \ \