| Commit message (Collapse) | Author | Age |
|
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|
|
|
|
|
| |
animated track with one element
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|
|
|
|
|
|
| |
another layer
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: 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>
|
| |\ |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@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>
|
| |
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |
| |
| |
| | |
on TimelinePanel class.
|
| |
| |
| |
| | |
a layer, and fix serialization variable problem.
|
|\| |
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\|
| |
| |
| |
| | |
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
|
| |\
| | |
| | | |
Timeline : Fix for the split and element model error
|
| | |
| | |
| | |
| | |
| | |
| | | |
Timeline
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>
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
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>
|
|
|
|
|
| |
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>
|