| Commit message (Collapse) | Author | Age |
... | |
|
|
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
|
|
|
|
| |
TimelineTrack component.
Cherry pick commit from jreid/Timeline-jreid
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
| |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
| |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
|
|
| |
Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|
|
|
|
|
| |
Timeline selection code is now handled by the selection controller and current container change
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| |
| |
| |
| | |
Conflicts:
js/ninja.reel/ninja.html
js/stage/stage.reel/stage.html
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
commit fe0d1578305db78eb5a744c354dbbb3cec67be2a
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Thu Feb 9 11:43:53 2012 -0800
Removing a flag
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
commit 7a7e5d9a07c85a9a35297efe74f8b45bc4bd3c62
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Thu Feb 9 11:42:39 2012 -0800
Timeline : Selection Handling depending on layer selected
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
commit d0a4d88ddef2f1690da490cf8f3d167f1eb01945
Merge: ad214f9 f6ad57e
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Thu Feb 9 09:54:42 2012 -0800
Merge branch 'refs/heads/Timeline' into Timeline_updated
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
commit ad214f9b5bc19c43eac39e4c9d93cd9645aed2ea
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Thu Feb 9 09:40:14 2012 -0800
Timeline : When element selected the corresponding layer highlights
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\ |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
commit 46292bddbfbe7415c6852142dd10fd02a276722a
Author: Jon Reid <tjh487@motorola.com>
Date: Wed Feb 8 14:32:22 2012 -0800
Timeline: turn off console logging.
commit b8de88393182bc6e819c3d6a290ade2f804236ac
Merge: e651344 37b952c
Author: Jon Reid <tjh487@motorola.com>
Date: Wed Feb 8 14:10:06 2012 -0800
Merge branch 'Timeline-jduran' into Timeline-jreid
commit e651344d5d6c2911b31a54510c65a349c4d52db2
Author: Jon Reid <tjh487@motorola.com>
Date: Wed Feb 8 14:08:25 2012 -0800
Timeline: Bug fixes
IKNINJA-947: Weird behavior with adding layers with an empty layer name selected
IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers
IKNINJA-1063: Styles can be added while style column is collapsed
IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\ |
|
| | | |
|
| |/
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
blur; we should never have a situation where no layers are selected.
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
remaining & when track is animated
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- Undo & Redo of Layers within same container
- Undo & Redo of Layers between different containers
- Adding the element on the layer selected else default is the last layer drawn
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
selectLayer, getLayerIndexByID and getLayerIndexByName.
|
| | | | |
|
| |/ /
| | |
| | |
| | | |
tracks and time markers (horizontal).
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
on stage
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
layer resizer now works in the correct direction when dragging
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |/
| |
| |
| |
| |
| | |
Update collapser to use namespaced webkitTransitionEnd events for forward compatibility.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
|/ |
|
|
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
|