| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #316 from imix23ways/Timeline-merge-candidate | Valerio Virgillito | 2012-06-20 |
| |\ | |||
| | * | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | |\ | |/ |/| | |||
| * | | Merge pull request #317 from joseeight/Color | Valerio Virgillito | 2012-06-20 |
| |\ \ | |||
| | * \ | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-20 |
| | |\ \ | |||
| | * | | | Fixes: IKNINJA-1448 | Jose Antonio Marquez | 2012-06-20 |
| * | | | | Merge pull request #315 from mqg734/IKNinja_1671 | Valerio Virgillito | 2012-06-20 |
| |\ \ \ \ | |||
| | * | | | | Fix for error when using ZoomTool. | Nivesh Rajbhandari | 2012-06-20 |
| | * | | | | Merge branch 'refs/heads/ninja-internal' into IKNinja_1671 | Nivesh Rajbhandari | 2012-06-20 |
| | |\ \ \ \ | |||
| | * | | | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated i... | Nivesh Rajbhandari | 2012-06-19 |
| * | | | | | | Merge pull request #314 from ericmueller/Grid | Valerio Virgillito | 2012-06-20 |
| |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Grid | hwc487 | 2012-06-20 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | Added logic to handle grid drawing where grid line starts on an object boundary | hwc487 | 2012-06-19 |
| | | |/ / / / / | |/| | | | | | |||
| | | | | | | * | remove bad file | Jonathan Duran | 2012-06-20 |
| | | | | | | * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 |
| | | | | | | |\ | |||
| | | | | | | | * | Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | | | | | | |\ | |||
| | | | | | | | | * | Timeline: Bug fix: Keyframe animation now works with 3D elements. | Jon Reid | 2012-06-20 |
| | | | | | | | | * | Merge remote-tracking branch 'ninja-internal/master' into timeline-local | Jon Reid | 2012-06-20 |
| | | | | | | | | |\ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||
| | | | | | | | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-20 |
| | | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | | | | | | | * | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||
| * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-06-20 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #313 from mqg734/GIO_Fixes | Valerio Virgillito | 2012-06-20 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| | | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into GIO_Fixes | Nivesh Rajbhandari | 2012-06-19 |
| | | |\| | | | | | | |||
| | | * | | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D spac... | Nivesh Rajbhandari | 2012-06-19 |
| | * | | | | | | | | Merge pull request #312 from joseeight/Color | Valerio Virgillito | 2012-06-20 |
| | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | | | |||
| | | * | | | | | | Fixing logic to close color panel popup | Jose Antonio Marquez | 2012-06-19 |
| | | | |/ / / / | | |/| | | | | |||
| * | | | | | | | fixing the css panel button hover | Valerio Virgillito | 2012-06-20 |
| * | | | | | | | remove the un-used css file | Valerio Virgillito | 2012-06-20 |
| * | | | | | | | fixing the last instances of the old montage components in the css panel | Valerio Virgillito | 2012-06-20 |
| * | | | | | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 |
| |\| | | | | | | |||
| * | | | | | | | fixing the css bugs with montage v11 | Valerio Virgillito | 2012-06-18 |
| * | | | | | | | fixing the components. | Valerio Virgillito | 2012-06-18 |
| * | | | | | | | 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 |
| * | | | | | | | | montage v11 merge into ninja | Valerio Virgillito | 2012-06-17 |
| | | | | | | * | | remove old method | Jonathan Duran | 2012-06-20 |
| | | | | | | * | | remove unneeded files | Jonathan Duran | 2012-06-20 |
| | | | | | | * | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | / | | | | | | |/ | |||
| | | * | | | | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | | |\ \ \ \ \ | |||
| | | | * | | | | | IKNINJA 1754 menu not opening on hover | Valerio Virgillito | 2012-06-19 |
| | | | |/ / / / | |||
| | | * | | | | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | | | * | | | | Reverting last change since this is is being made in a different pull request. | Ananya Sen | 2012-06-19 |
| | | | * | | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main men... | Ananya Sen | 2012-06-19 |
| | | | * | | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ... | Ananya Sen | 2012-06-18 |
| | | | | | * | | Removed some code | Kruti Shah | 2012-06-20 |
| | | | | | * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 |
| | | | | | |\| | |||
| | | | | | | * | remove obsolete functions | Jonathan Duran | 2012-06-19 |
| | | | | | | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 |
| | | | | | | |\ | |||
| | | | | | | * | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 |
| | | | | | * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-19 |
| | | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||
| | | | | | | * | | prop tween splitting | Jonathan Duran | 2012-06-19 |