aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| |\
| | * Fixing reference issue for toolbar fill containerJose Antonio Marquez2012-06-21
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
| | |\
| | | * Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\
| | | * \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\ \
| | | * \ \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\ \ \
| | | * \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Timeline: bug fix "Layer name gets doubled" (Spreadsheet)Jon Reid2012-05-24
| | | * | | | | | | | | | Timeline: Bug fix: Layer name gets doubled (spreadsheet)Jon Reid2012-05-24
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge pull request #317 from joseeight/ColorValerio Virgillito2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Fixes: IKNINJA-1448Jose Antonio Marquez2012-06-20
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
* | | | | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | fixing the css panel button hoverValerio 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
| | * | | | | | | | | 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
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-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
| | | |/ / / / / /
* | | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\| | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| |\| | | | | | |
| | * | | | | | | Cleaning reelJose Antonio Marquez2012-06-17
| | * | | | | | | Cleaning up element referencesJose Antonio Marquez2012-06-17
| | * | | | | | | Tidying up color barJose Antonio Marquez2012-06-17
| | |/ / / / / /
| | * | | | | | Fix: IKNINJA-1187Jose Antonio Marquez2012-06-13
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-13
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
| | | | |\ \ \ \ \ \
| | | | * | | | | | | fixed document switching issuesValerio Virgillito2012-06-12
| | | | * | | | | | | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | | * | | | | | | adding more missing propertiesValerio Virgillito2012-06-11
| | | | * | | | | | | adding more missing propertiesValerio Virgillito2012-06-11
| | | | * | | | | | | removing serializable to the tree and adding a few more missing propertiesValerio Virgillito2012-06-11