aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* remove bad fileJonathan Duran2012-06-20
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
|\
| * Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\
| | * Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| | |
| | * Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| | |\
| | * \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-20
| | |\ \
| * | \ \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| | |\ \ \
| | | * \ \ Merge pull request #313 from mqg734/GIO_FixesValerio Virgillito2012-06-20
| | | |\ \ \ | | | | | | | | | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D space or in Top/Side view.
| | | | * \ \ Merge branch 'refs/heads/ninja-internal' into GIO_FixesNivesh Rajbhandari2012-06-19
| | | | |\ \ \
| | | | * | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D ↵Nivesh Rajbhandari2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space or in Top/Side view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | Merge pull request #312 from joseeight/ColorValerio Virgillito2012-06-20
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | Fixing logic to close color panel popup
| | | | * | | | Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | This resolves closing the color panel popup when a user make a click outside the popup area or resizes the Ninja window. This should be tested prior to merging.
| | * | | | | fixing the css panel button hoverValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | remove the un-used css fileValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | fixing the components.Valerio Virgillito2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | montage v11 merge into ninjaValerio Virgillito2012-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | remove old methodJonathan Duran2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | remove unneeded filesJonathan Duran2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internalValerio Virgillito2012-06-19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | IKNINJA 1754 menu not opening on hoverValerio Virgillito2012-06-19
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internalValerio Virgillito2012-06-19
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Reverting last change since this is is being made in a different pull request.Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu does not work when a main menu drop down is already displayed. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵Ananya Sen2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | Removed some codeKruti Shah2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | remove obsolete functionsJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
| |\ \ \ \ \ \
| * | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manipulation!
* | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | prop tween splittingJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | LockedElements - LayersKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | Layer LockKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | Lock ElementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
*