| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 |
| |\ | |||
| | * | Merge pull request #323 from dhg637/binding | Valerio Virgillito | 2012-06-26 |
| | |\ | | | | | | | Binding View - Binding Tool & Binding Panel | ||
| | | * | Reverting binding.js | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | 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> | ||
| | | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-25 |
| | | | |\ | |||
| | | * | | | 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> | ||
| | | * | | | Removed Console Logs | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | Text Tool Fix - Can Not Switch Document when Text Tool Initialized | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | Binding View - Hide when in code view | Eric Guzman | 2012-06-21 |
| | | | | | | |||
| | | * | | | Hintable - Remove overridden method | Eric Guzman | 2012-06-21 |
| | | | | | | |||
| | | * | | | 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> | ||
| | | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-21 |
| | | | |\ \ | |||
| | | * | \ \ | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-21 |
| | | |\ \ \ \ | |||
| | | | * | | | | Binding View: Hud Scroll Limit Is now 8 | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 HUD - CSS Update | Eric Guzman | 2012-06-21 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | | |\| | | | | |||
| | | | * | | | | Binding Panel - Fixed Panel Button | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | | |\| | | | | |||
| | | | * | | | | 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 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-20 |
| | | | | |\ \ \ | |||
| | | | * | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| | | | |\| | | | | |||
| | | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-20 |
| | | | | |\ \ \ \ | |||
| | | | * | | | | | | Binding-View : Polish state | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | | | | Merge branch 'refs/heads/binding_eric' into binding | Armen Kesablyan | 2012-06-20 |
| | | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | | |\| | | | | | | | | | |/ / / / / / | | |/| | | | | | | |||
| | | | * | | | | | | binding-hud Scroll Up | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Binding HUD - Show hud for "off stage" objects in tray | Eric Guzman | 2012-06-20 |
| | | | | | | | | | | |||
| | | * | | | | | | | Objects Tray - Use label instead of identifier for object name | Eric Guzman | 2012-06-20 |
| | | | | | | | | | | |||
| | | * | | | | | | | Objects Tray - Filter list of components for those without visual representation | Eric Guzman | 2012-06-20 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | | |\| | | | | | | |||
| | | | * | | | | | | Binding View - Hover Scroll | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | | |\| | | | | | | |||
| | | | * | | | | | | Showing Bound Items in hud | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | | | | Binding View - Added Line cap in drawing line & Fixed bug to not pop up on ↵ | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current component Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| | | |\| | | | | | | |||
| | | | * | | | | | | Binding View - Mouse Over Element Pop up Hud | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Objects Tray - Show only "off stage" objects | Eric Guzman | 2012-06-19 |
| | | |/ / / / / / | |||
| | | * | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/binding-view.reel/binding-view.js | ||
| | | | * | | | | | | Bug: Text Tool Breaking canvas space. | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-19 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html j | ||