aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | * | | | | | 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>
| | * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-26
| | |\| | | | | |
| | | * | | | | | 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)
| | | * | | | | | | | 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/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-22
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge pull request #343 from ericguzman/CSSPanel_GIOValerio Virgillito2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | Css panel gio
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-06-27
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | CSSPanel_GIO
| | * | | | | | | | | | IKNINJA-1659 - Fix error when calling preventDefault()Eric Guzman2012-06-26
| | | | | | | | | | | |
| | * | | | | | | | | | IKNINJA-1667 - Fix for JIRA issue involving updating rule list on selection ↵Eric Guzman2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change.
| * | | | | | | | | | | Merge pull request #339 from ananyasen/bugfix-masterValerio Virgillito2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | fixed code hinting and autocompletion bug
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-27
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | initialize auto code hinting flag with checkbox value, on switching between ↵Ananya Sen2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | turning off autocompletion since it is interfering typingAnanya Sen2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | refactored to move bindings to templateAnanya Sen2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |