aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
|\
| * Merge pull request #315 from mqg734/IKNinja_1671Valerio Virgillito2012-06-20
| |\
| | * Merge branch 'refs/heads/ninja-internal' into IKNinja_1671Nivesh Rajbhandari2012-06-20
| | |\
| | * | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated i...Nivesh Rajbhandari2012-06-19
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
|\| | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
| |\ \ \
| * | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'refs/heads/ninja-internal' into GIO_FixesNivesh Rajbhandari2012-06-19
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| | | |\|
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | | |\ \
| | | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | | |\ \ \
| | | * | | | Removed references to NJUtilshwc4872012-06-12
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Fixing merge issueshwc4872012-05-14
| | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textureshwc4872012-05-03
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin...Nivesh Rajbhandari2012-05-03
| | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-02
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Material editorhwc4872012-05-02
| * | | | | | | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D spac...Nivesh Rajbhandari2012-06-19
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | fixed document switching issuesValerio Virgillito2012-06-12
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * / | | | | | | | fix bug #1718 (trying to delete a non-existent canvas)Pushkar Joshi2012-06-13
| |/ / / / / / / /
| * | | | | | | | correct mouse cursor on mousemovePushkar Joshi2012-06-12
| * | | | | | | | allow the addition of anchor points to a closed path (the mouse move cursor s...Pushkar Joshi2012-06-12
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| |\ \ \ \ \ \ \
| * | | | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
* | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | |\ \ \ \ \ \ \
| | * | | | | | | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| * | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #276 from mqg734/DrawingToolsValerio Virgillito2012-06-06
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Do not create any tags or shapes with width or height of 0.Nivesh Rajbhandari2012-06-06
| * | | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | | |/ / / / / / /
| | | * | | | | | | handle switching between multiple documents for Pen tool by having its own se...Pushkar Joshi2012-06-05
| | | * | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | change the behavior of what happens when alt is pressed while moving anchor h...Pushkar Joshi2012-05-31
| | | * | | | | | | somewhat working version of the canvas runtime for pen paths (the runtime ren...Pushkar Joshi2012-05-31
| | | * | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |