aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | Merge pull request #341 from ericguzman/Chrome20_CSS_WorkaroundValerio Virgillito2012-06-27
| | | | | | | |/| | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | Styles Controller - Chrome 20 Fix
| | | | | | | | * | | | | | | | | | | | | Styles Controller - Remove debuggerEric Guzman2012-06-26
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | Styles Controller - Chrome 20 FixEric Guzman2012-06-26
| | | | | | | |/ / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | initialize auto code hinting flag with checkbox value, on switching between ↵Ananya Sen2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |