aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Fixing minor color history bugJose Antonio Marquez2012-06-27
|
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
|\
| * Merge pull request #342 from imix23ways/Timeline-pullrequestValerio Virgillito2012-06-27
| |\ | | | | | | Timeline Bugfixes
| | * Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-06-27
| | |\
| | | * Bug Fix : Hot Text change from the CSS panelKruti Shah2012-06-27
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | Fix live preview animation lockJonathan Duran2012-06-27
| | |/ | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-27
| | |\
| | | * Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-27
| | | |\
| | | | * Timeline: Bug fix: Hintable should work better now.Jon Reid2012-06-27
| | | | |
| | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-27
| | | |\ \
| | | * | | Fix animation names breakingJonathan Duran2012-06-27
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | Fix element getting stuck with live preview modeJonathan Duran2012-06-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-27
| | | |\ \
| | * | \ \ Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-27
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵Kruti Shah2012-06-27
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-27
| | |\ \ \
| | | * | | FIx - hook up play button in timeline to live previewJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | | Fix keyframe selection stickinessJonathan 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: 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/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-27
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Bug Fix: Fix Animation for Position & Size PropsKruti Shah2012-06-27
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-26
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ 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
| | | | | | | |
| | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
| | |\ \ \ \ \ \
| | * | | | | | | 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: 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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 15:11:47 +0000