aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidateJonathan Duran2012-06-21
|\
| * Sub Property ADding KEyframe fixedKruti Shah2012-06-21
* | Merge pull request #316 from imix23ways/Timeline-merge-candidateValerio Virgillito2012-06-20
|\ \
| * \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ | |/ / |/| |
* | | Merge pull request #317 from joseeight/ColorValerio Virgillito2012-06-20
|\ \ \
| * \ \ Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| |\ \ \
| * | | | Fixes: IKNINJA-1448Jose Antonio Marquez2012-06-20
* | | | | Merge pull request #315 from mqg734/IKNinja_1671Valerio Virgillito2012-06-20
|\ \ \ \ \
| * | | | | Fix for error when using ZoomTool.Nivesh Rajbhandari2012-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 pull request #314 from ericmueller/GridValerio Virgillito2012-06-20
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gridhwc4872012-06-20
| |\ \ \ \ \ \ \
| * | | | | | | | Added logic to handle grid drawing where grid line starts on an object boundaryhwc4872012-06-19
| | |/ / / / / / | |/| | | | | |
| | | | | | * | remove bad fileJonathan Duran2012-06-20
| | | | | | |/
| | | | | | * 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
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'refs/heads/ninja-internal' into GIO_FixesNivesh Rajbhandari2012-06-19
| | |\| | | | | |
| | * | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D spac...Nivesh Rajbhandari2012-06-19
| * | | | | | | | Merge pull request #312 from joseeight/ColorValerio Virgillito2012-06-20
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| | | |/ / / / | | |/| | | |
* | | | | | | fixing the css panel button hoverValerio Virgillito2012-06-20
* | | | | | | remove the un-used css fileValerio Virgillito2012-06-20
* | | | | | | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
* | | | | | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
|\| | | | | |
* | | | | | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
* | | | | | | fixing the components.Valerio Virgillito2012-06-18
* | | | | | | 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
* | | | | | | | montage v11 merge into ninjaValerio Virgillito2012-06-17
| | | | | | * | remove old methodJonathan Duran2012-06-20
| | | | | | * | remove unneeded filesJonathan Duran2012-06-20
| | | | | | * | 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
| | |\ \ \ \ \
| | | * | | | | IKNINJA 1754 menu not opening on hoverValerio Virgillito2012-06-19
| | | |/ / / /
| | * | | | | 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
| | | * | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main men...Ananya Sen2012-06-19
| | | * | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ...Ananya Sen2012-06-18
| | | | | * | Removed some codeKruti Shah2012-06-20
| | | | | * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | | | | |\|
| | | | | | * remove obsolete functionsJonathan Duran2012-06-19
| | | | | | * 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