aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
|\
| * Fixing reference issue for toolbar fill containerJose Antonio Marquez2012-06-21
| | | | | | | | The wrapper container was not being referenced, caused some toggling visibility issues.
| * 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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| | * \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | Color
| * | | | | | | | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge.
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Fixes: IKNINJA-1448Jose Antonio Marquez2012-06-20
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improving logic on calculating position of the color stops in the gradient picker.
* | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | fixing the css panel button hoverValerio 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>
| * | | | | | | | | 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>
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | 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
| |</