| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | ||||
| | | * | | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | | |\ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ | 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> | |||
| | * | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-26 | |
| | |\| | | | | | | | ||||
| | | * | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Injection from fix of IKNINJA-1783) | |||
| | | * | | | | | | | | | Timeline: Bug fix IKNINJA-1791 Double-clicking to go in a child level and | Jon Reid | 2012-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 style | Jon Reid | 2012-06-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property of an object on top layer | |||
| | | * | | | | | | | | | Timeline: Bug fix IKNINJA-1783, Timeline panel is disabled when CSS file is | Jon Reid | 2012-06-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open in another tab. | |||
| | | * | | | | | | | | | Timeline: Bug Fix: Document switching was doubling position tracks. | Jon Reid | 2012-06-21 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-22 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| * | \ \ \ \ \ \ \ \ \ \ | Merge pull request #343 from ericguzman/CSSPanel_GIO | Valerio Virgillito | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | Css panel gio | |||
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | CSSPanel_GIO | |||
| | * | | | | | | | | | | | IKNINJA-1659 - Fix error when calling preventDefault() | Eric Guzman | 2012-06-26 | |
| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | IKNINJA-1667 - Fix for JIRA issue involving updating rule list on selection ↵ | Eric Guzman | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change. | |||
| * | | | | | | | | | | | | Merge pull request #339 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-27 | |