aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\
| * Timeline: Bug fix: Adding or splitting tweens on multiple layers at onceJon Reid2012-06-26
| | | | | | | | will no longer change the selection.
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| |\
| * | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,Jon Reid2012-06-26
| | | | | | | | | | | | including splitting tweens.
* | | Fix missing serialization in Layer.jsJonathan Duran2012-06-26
| |/ |/| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\|
| * Timeline: Bug fix: Indexing on styles when loading files.Jon Reid2012-06-26
| |
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| |\
| * | Timeline: Bug fix IKNINJA-1816Jon Reid2012-06-26
| | |
* | | Fix - deselect tweens when selecting a layerJonathan Duran2012-06-26
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-26
|\ \ \ | | |/ | |/|
| * | Fix sub prop tween selection to select main tweenJonathan Duran2012-06-26
| |/ | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix sub prop animationsJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix end animation for style tracksJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Fix animation to end at last keyframeJonathan Duran2012-06-26
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Bug Fix : Color Chip PositionKruti Shah2012-06-26
| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | BugFix - Color Chip Positioning & Checking for null value of the current colorKruti Shah2012-06-26
|/ | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Fix play marker appearing in wrong position when clicking on a tweenJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Move time marker when clicking anywhere in timeline tracksJonathan Duran2012-06-26
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\
| * Timeline: bug fix: command-click now works for multi selecting layers on ↵Jon Reid2012-06-25
| | | | | | | | Macs. Also disabled control-click on macs.
| * Timeline: Bug fix IKNINJA-1812, "Easing option switches to NoneJon Reid2012-06-25
| | | | | | | | automatically when moving a keyframe"
| * Timeline: CSS fixes.Jon Reid2012-06-25
| |
* | Timeline Bug fixesJonathan Duran2012-06-26
|/ | | | | | Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-25
|\ | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
| * Timeline Fix - reopen subprop keyframes for Position and Size correctlyJonathan Duran2012-06-25
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline fix - remove unneeded bindingJonathan Duran2012-06-22
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * FIx - can't delete keyframesJonathan Duran2012-06-22
| | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidateJonathan Duran2012-06-21
| |\
| | * Sub Property ADding KEyframe fixedKruti Shah2012-06-21
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | remove bad fileJonathan Duran2012-06-20
| |/ | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\
| * \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| |\ \ \
| * | | | LockedElements - LayersKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Layer LockKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Lock ElementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Lock ELementsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | Locked Elements. Layer ControlsKruti Shah2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Timeline: Breadcrumb hash in currentDocument will now update as changesJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | are made to the DOM.
* | | | | Timeline: Bug fix: When creating a new file, Timeline was disabled.Jon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | (Injection from fix of IKNINJA-1783)
* | | | | Timeline: Bug fix IKNINJA-1791 Double-clicking to go in a child level andJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | coming back up to Body will collapse its layer and wipe out all the sub property keyframes.
* | | | | Timeline: Bug fix IKNINJA-1755 Can't insert keyframes in a CSS styleJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | property of an object on top layer
* | | | | Timeline: Bug fix IKNINJA-1783, Timeline panel is disabled when CSS file isJon Reid2012-06-21
| | | | | | | | | | | | | | | | | | | | open in another tab.
* | | | | Timeline: Bug Fix: Document switching was doubling position tracks.Jon Reid2012-06-21
| |_|_|/ |/| | |
* | | | Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
|\ \ \ \
| * | | | Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| | |_|/ | |/| |
* / | | remove unneeded filesJonathan Duran2012-06-20
|/ / / | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | remove obsolete functionsJonathan Duran2012-06-19
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
|\ \ \ | | |/ | |/|