Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | | | | | 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 | |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | remove obsolete functions | Jonathan Duran | 2012-06-19 | |
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | prop tween splitting | Jonathan Duran | 2012-06-19 | |
| * | | | | | | | | | | | | | | Lock Position and Size keyframes to main track keyframes | Jonathan Duran | 2012-06-19 | |
| * | | | | | | | | | | | | | | Fix position tracks collapser to use unique element | Jonathan Duran | 2012-06-19 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||
* / | | | | | | | | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 | |
|/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | Timeline: Enable splitting of keyframes with F6 interaction. | Jon Reid | 2012-06-18 | |
| * | | | | | | | | | | | | | Timeline: Default easing for new animation keyframes set to "none" per CSS | Jon Reid | 2012-06-18 | |
| * | | | | | | | | | | | | | Timeline: Bug Fixes | Jon Reid | 2012-06-18 | |
* | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| / / / / / / / / / / / / | |/ / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 | |
| |\ \ \ < |