aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-27
|\
| * Styles Controller - Remove debuggerEric Guzman2012-06-26
| |
| * Styles Controller - Chrome 20 FixEric Guzman2012-06-26
| |
* | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-27
|\ \
| * | FIx - hook up play button in timeline to live previewJonathan Duran2012-06-26
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | Fix keyframe selection stickinessJonathan 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: Adding or splitting tweens on multiple layers at onceJon Reid2012-06-26
| | | | | | | | | | | | | | | | will no longer change the selection.
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| | |\ \
| | * | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,Jon Reid2012-06-26
| | | | | | | | | | | | | | | | | | | | including splitting tweens.
| * | | | Fix missing serialization in Layer.jsJonathan 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: Indexing on styles when loading files.Jon Reid2012-06-26
| | | |
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| | |\ \
| | * | | Timeline: Bug fix IKNINJA-1816Jon Reid2012-06-26
| | | | |
| * | | | Fix - deselect tweens when selecting a layerJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ \ \ \ | | | | | | | | | | | | Binding View - Binding Tool & Binding Panel
| | * | | | Binding View - Removed DebuggerArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Binding View - Objects Replace existing source Object if it existsArmen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Can bind Multiple instanceArmen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-25
| | | |\ \ \ \
| | * | | | | | Binding Panel - Changing direction in edit mode doesn't apply dirty to the ↵Armen Kesablyan2012-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 BindingsArmen Kesablyan2012-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 OutArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Removed Console LogsArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Binding View - Hide when in code viewEric Guzman2012-06-21
| | | | | | | |
| | * | | | | | Hintable - Remove overridden methodEric Guzman2012-06-21
| | | | | | | |
| | * | | | | | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-21
| | |\ \ \ \ \ \ \
| | | * | | | | | | Binding View: Hud Scroll Limit Is now 8Armen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | Binding HUD - CSS UpdateEric Guzman2012-06-21
| | |/ / / / / / /
| | * | | | | | | Binding Panel - Fixed Panel ButtonArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | BindingView :Montage UpdatesArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \ \ \ \
| | * | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | | | | | |
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Binding-View : Polish stateArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | Merge branch 'refs/heads/binding_eric' into bindingArmen Kesablyan2012-06-20
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Binding HUD - Show hud for "off stage" objects in trayEric Guzman2012-06-20
| | | | | | | | | | | |
| | | * | | | | | | | | Objects Tray - Use label instead of identifier for object nameEric Guzman2012-06-20
| | | | | | | | | | | |
| | | * | | | | | | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| | | |\ \ \ \ \ \ \