aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Commit message (Collapse)AuthorAge
...
* Timeline: Create new PropertyTrack subcomponent, and use it in the ↵Jonathan Duran2012-02-23
| | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fixes for animation element assignmentJonathan Duran2012-02-09
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Display time reading above layers and code clean upJonathan Duran2012-02-08
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Squashed commit of the following:Jonathan Duran2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Hookup track animations to layer elementJonathan Duran2012-02-07
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* merge new timelineJonathan Duran2012-02-06
Signed-off-by: Jonathan Duran <jduran@motorola.com>