| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-06-27 |
| |\ | | | | | | | Bindables_GIO | ||
| | * | Merge pull request #342 from imix23ways/Timeline-pullrequest | Valerio Virgillito | 2012-06-27 |
| | |\ | | | | | | | Timeline Bugfixes | ||
| | | * | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | | |\ | |||
| | | | * | Bug Fix : Hot Text change from the CSS panel | Kruti Shah | 2012-06-27 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | Fix live preview animation lock | Jonathan Duran | 2012-06-27 |
| | | |/ | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | |\ | |||
| | | | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | | | |\ | |||
| | | | | * | Timeline: Bug fix: Hintable should work better now. | Jon Reid | 2012-06-27 |
| | | | | | | |||
| | | | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | | | |\ \ | |||
| | | | * | | | Fix animation names breaking | Jonathan Duran | 2012-06-27 |
| | | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | Fix element getting stuck with live preview mode | Jonathan Duran | 2012-06-27 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-27 |
| | | | |\ \ | |||
| | | * | \ \ | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | | * | | | | Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵ | Kruti Shah | 2012-06-27 |
| | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | |\ \ \ | |||
| | | | * | | | FIx - hook up play button in timeline to live preview | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | Fix keyframe selection stickiness | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | | |\ \ \ | |||
| | | | | * | | | Timeline: Bug fix: Adding or splitting tweens on multiple layers at once | Jon Reid | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will no longer change the selection. | ||
| | | | | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 |
| | | | | |\ \ \ | |||
| | | | | * | | | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes, | Jon Reid | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including splitting tweens. | ||
| | | | * | | | | | Fix missing serialization in Layer.js | Jonathan Duran | 2012-06-26 |
| | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | | |\| | | | |||
| | | | | * | | | Timeline: Bug fix: Indexing on styles when loading files. | Jon Reid | 2012-06-26 |
| | | | | | | | | |||
| | | | | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 |
| | | | | |\ \ \ | |||
| | | | | * | | | | Timeline: Bug fix IKNINJA-1816 | Jon Reid | 2012-06-26 |
| | | | | | | | | | |||
| | | | * | | | | | Fix - deselect tweens when selecting a layer | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | | |\ \ \ \ \ | |||
| | | * | \ \ \ \ \ | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||
| | | * | | | | | | | Bug Fix: Fix Animation for Position & Size Props | Kruti Shah | 2012-06-27 |
| | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-26 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-26 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||
| | | | * | | | | | | Fix sub prop tween selection to select main tween | Jonathan Duran | 2012-06-26 |
| | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | | Fix sub prop animations | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | | Fix end animation for style tracks | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | | * | | | | | Fix animation to end at last keyframe | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Bug Fix : Color Chip Position | Kruti Shah | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | BugFix - Color Chip Positioning & Checking for null value of the current color | Kruti Shah | 2012-06-26 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | Fix play marker appearing in wrong position when clicking on a tween | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | Move time marker when clicking anywhere in timeline tracks | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | |\ \ \ \ \ | |||
| | | | * | | | | | Timeline: bug fix: command-click now works for multi selecting layers on ↵ | Jon Reid | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Macs. Also disabled control-click on macs. | ||
| | | | * | | | | | Timeline: Bug fix IKNINJA-1812, "Easing option switches to None | Jon Reid | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatically when moving a keyframe" | ||
| | | | * | | | | | Timeline: CSS fixes. | Jon Reid | 2012-06-25 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Timeline Bug fixes | Jonathan Duran | 2012-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-local | Jon Reid | 2012-06-25 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both. | ||
| | | * | | | | | | | Timeline: Breadcrumb hash in currentDocument will now update as changes | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are made to the DOM. | ||
| | | * | | | | | | | Timeline: Bug fix: When creating a new file, Timeline was disabled. | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||