aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | | | | | | | | | * | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵Jon Reid2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console.log calls in hintable component.
| | | | | | | | | | | | | | | | | | | * | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer ↵Jon Reid2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection UI.
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in ↵Jon Reid2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimelinePanel for creating new styles on document load.
| | | | | | | | | | | | | | | | | | * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | / / / / / / / / | | | | | | | | | | | | | | | | | | |/ / / / / / / /
| | | | | | | | | | | | | | | | | | * | | | | | | | Fix layer order and selection on reopenJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layer order should be in the same order as created. Nothing should be selected with opening a doc. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
| | | | | | | | | | | | | | | | | | | | * | | | | | | | | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * | | | | | | | | Timeline: remove comment.Jon Reid2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * | | | | | | | | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | | | | | | | | Consolidate conversion functionsJonathan Duran2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | | | | | | | | | | | | | | | * | | | | | | | | | | | CleanupJonathan Duran2012-03-16