Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-20 |
|\ | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-06-20 |
| |\ | |||
| * \ | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 |
| |\ \ | |||
| * \ \ | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-18 |
| |\ \ \ | |||
| * | | | | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
* | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-20 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| * | | | | Merge branch 'refs/heads/ninja-internal' into GIO_Fixes | Nivesh Rajbhandari | 2012-06-19 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 |
| | |\ \ \ | | | |_|/ | | |/| | | |||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-14 |
| | | |\| | |||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 |
| | | |\ \ \ | |||
| | | * | | | | Removed references to NJUtils | hwc487 | 2012-06-12 |
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-12 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-31 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-17 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Fixing merge issues | hwc487 | 2012-05-14 |
| | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textures | hwc487 | 2012-05-03 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin... | Nivesh Rajbhandari | 2012-05-03 |
| | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-02 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||
| | | * | | | | | | | | | | Material editor | hwc487 | 2012-05-02 |
| * | | | | | | | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D spac... | Nivesh Rajbhandari | 2012-06-19 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Fixing apply 'no color' | Jose Antonio Marquez | 2012-06-15 |
| |/ / / / / / / / / / | |||
| * | | | | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-13 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | fixed document switching issues | Valerio Virgillito | 2012-06-12 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| * / | | | | | | | | fix bug #1718 (trying to delete a non-existent canvas) | Pushkar Joshi | 2012-06-13 |
| |/ / / / / / / / | |||
| * | | | | | | | | correct mouse cursor on mousemove | Pushkar Joshi | 2012-06-12 |
| * | | | | | | | | allow the addition of anchor points to a closed path (the mouse move cursor s... | Pushkar Joshi | 2012-06-12 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/master' into dom-container | Valerio Virgillito | 2012-06-11 |
| |\ \ \ \ \ \ \ | |||
| * | | | | | | | | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
* | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-11 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #280 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-06-08 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | * | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-07 |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | change the PI to make it look like the fill color affects the brush stroke color | Pushkar Joshi | 2012-06-07 |
| * | | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #276 from mqg734/DrawingTools | Valerio Virgillito | 2012-06-06 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Do not create any tags or shapes with width or height of 0. | Nivesh Rajbhandari | 2012-06-06 |
| * | | | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| |\| | | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #272 from pushkarjoshi/pentool | Valerio Virgillito | 2012-06-06 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | | |/ / / / / / / | |||
| | | * | | | | | | | handle switching between multiple documents for Pen tool by having its own se... | Pushkar Joshi | 2012-06-05 |
| | | * | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-04 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||
| | | * | | | | | | | change the behavior of what happens when alt is pressed while moving anchor h... | Pushkar Joshi | 2012-05-31 |
| | | * | | | | | | | somewhat working version of the canvas runtime for pen paths (the runtime ren... | Pushkar Joshi | 2012-05-31 |
| | | * | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | |||
| | | * | | | | | | | working version of the pen plus subtool | Pushkar Joshi | 2012-05-30 |
| | | * | | | | | | | working version of Pen minus subtool | Pushkar Joshi | 2012-05-30 |
| | | * | | | | | | | More consistent local and global mouse coords which solves a bug with the Pen... | Pushkar Joshi | 2012-05-29 |
| | | * | | | | | | | rename dragging plane to dragPlane (for consistency with ShapeTool) | Pushkar Joshi | 2012-05-29 |