| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | clean up | Jonathan Duran | 2012-06-28 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-28 |
| |\ | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section. | ||
| | * | FIX layer selection bug | Jonathan Duran | 2012-06-28 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Timeline: bug fix IKNINJA-1843 | Jon Reid | 2012-06-27 |
| | | | |||
| | * | Merge pull request #347 from mqg734/ComponentShapeToolBug | Valerio Virgillito | 2012-06-27 |
| | |\ | | | | | | | Temporarily disable ElementMediator's addDelegate when adding components. | ||
| | | * | Temporarily disable ElementMediator's addDelegate when adding components. | Nivesh Rajbhandari | 2012-06-27 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge pull request #342 from imix23ways/Timeline-pullrequest | Valerio Virgillito | 2012-06-27 |
| | |\ \ | | | | | | | | | Timeline Bugfixes | ||
| | * \ \ | 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. | ||
| * | | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 |
| | |_|/ |/| | | |||
| * | | | Bug Fix : Hot Text change from the CSS panel | Kruti Shah | 2012-06-27 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@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 |
| | | | | | | |||
| | * | | | | Fix animation names breaking | 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 |
| |\ \ \ \ | | |/ / | |/| | | |||
| | * | | | Styles Controller - Chrome 20 Fix | Eric Guzman | 2012-06-26 |
| | | | | | |||
| * | | | | 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 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | * | | | | | Merge pull request #323 from dhg637/binding | Valerio Virgillito | 2012-06-26 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Binding View - Binding Tool & Binding Panel | ||
| | | * | | | | Binding View - Removed Debugger | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | Binding View - Objects Replace existing source Object if it exists | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | Can bind Multiple instance | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-25 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Binding Panel - Changing direction in edit mode doesn't apply dirty to the ↵ | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit form Check/Uncheck the Binding direction (Oneway) check box in the binding setting doesn't enable "SAVE" button. Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Binding Panel - Can Now Edit and Delete Bindings | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug Description: Binding Arguments that are passed in the edit form were being set to null after it was set. Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Binding View: Fixed If Selected Div Erroring Out | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-21 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Binding View - Minor Fixes to remove warnings | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Binding Panel - Fixed Panel Button | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | BindingView :Montage Updates | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| | | |\ \ \ \ \ \ \ | |||