| Commit message (Collapse) | Author | Age |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
previously selected style when parent layer is reselected.
|
| |
| |
| |
| | |
correctly.
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | |
|
| |
| |
| |
| | |
layer name disappear.
|
| |
| |
| |
| | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|/
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |
|
| |
|
|
|
|
| |
preparation for montage converting to the new "prototype" format fully
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
| |
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>
|