| Commit message (Collapse) | 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 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | 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 |
| | | |\ \ \ | | | |_|/ | | |/| | | Textures | ||
| | | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| | | | |\| | | | | | | | | | | | | | | | | Textures | ||
| | | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | Textures | ||
| | | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | | | * | | | | Removed references to NJUtils | hwc487 | 2012-06-12 |
| | | | | | | | | |||
| | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-12 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js | ||
| | | | * \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-31 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-17 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | | * | | | | | | | | Fixing merge issues | hwc487 | 2012-05-14 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| | | | * \ \ \ \ \ \ \ \ | 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 ↵ | Nivesh Rajbhandari | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linear/RadialGradientMaterials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-02 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | | | * | | | | | | | | | | Material editor | hwc487 | 2012-05-02 |
| | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D ↵ | Nivesh Rajbhandari | 2012-06-19 |
| | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space or in Top/Side view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper). | ||
| | * | | | | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-13 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | | * | | | | | | | | | fixed document switching issues | Valerio Virgillito | 2012-06-12 |
| | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * / | | | | | | | | 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 ↵ | Pushkar Joshi | 2012-06-12 |
| | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | still needs to be updated) | ||
| | * | | | | | | | Merge branch 'refs/heads/master' into dom-container | Valerio Virgillito | 2012-06-11 |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Brushtool | ||
| | | * | | | | | | | 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 | |