| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | | | | | | | | | | | | | collapse fix for restored style layers | Jonathan Duran | 2012-05-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | Timeline: Easing selection per keyframe. | Jon Reid | 2012-05-23 | |
| | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-23 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | | | Timeline: New easing selector in spans. | Jon Reid | 2012-05-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | recreating layer props | Jonathan Duran | 2012-05-24 | |
| | | | |_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | | | | | | | | | | | | | | Diamond keyframes | Jonathan Duran | 2012-05-23 | |
| | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | | | | | | | | | | | | | update ease method to distinguish between main animation and prop animations | Jonathan Duran | 2012-05-22 | |
| | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-22 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | | Timeline: Code cleanup | Jon Reid | 2012-05-18 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | Timeline: Bug fixes for deleting elements. | Jon Reid | 2012-05-18 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties and | Jon Reid | 2012-05-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change). | |||
| | | | * | | | | | | | | | | | | | | | | | | Timeline: More bug fixes and code cleanup for multiselect. | Jon Reid | 2012-05-17 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | Timeline: Bug fixes for multiselect | Jon Reid | 2012-05-17 | |
| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local | Jon Reid | 2012-05-17 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | | | Timeline: Multiselect improvements. New convenience methods. Multiselect | Jon Reid | 2012-05-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag and drop. | |||
| | | | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local | Jon Reid | 2012-05-16 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵ | Jon Reid | 2012-05-15 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeline-multiselect | |||
| | | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Multiselect from the layer panel. | Jon Reid | 2012-05-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'timeline-local' into timeline-multiselect | Jon Reid | 2012-05-15 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers) | |||
| | | | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Code cleanup. Improve efficiency for track scrolling. | Jon Reid | 2012-05-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Timeline: Multiselect. | Jon Reid | 2012-04-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-22 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||