| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #323 from dhg637/binding | Valerio Virgillito | 2012-06-26 |
| |\ | | | | | Binding View - Binding Tool & Binding Panel | ||
| | * | 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 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> | ||
| | * | | | Binding View - Hide when in code view | 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 '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 HUD - CSS Update | Eric Guzman | 2012-06-21 |
| | |/ / / | |||
| | * | | | 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 |
| | |\ \ \ | |||
| | | * | | | Binding HUD - Show hud for "off stage" objects in tray | 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 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | Objects Tray - Show only "off stage" objects | Eric Guzman | 2012-06-19 |
| | | | | | | | | | |||
| | * | | | | | | | binding-hud Scroll Up | Armen Kesablyan | 2012-06-20 |
| | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | Binding View - Hover Scroll | Armen Kesablyan | 2012-06-20 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | 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> | ||
| | * | | | | Binding View - Mouse Over Element Pop up Hud | Armen Kesablyan | 2012-06-19 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | 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 js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-19 |
| | | | |\ \ | |||
| | | * | | | | Binding-View: Visual Bind Item Working | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | Binding Hud CSS Change | Eric Guzman | 2012-06-19 |
| | |/ / / / | |||
| | * | | | | Latest Changes Visual Binding Starting | Armen Kesablyan | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-18 |
| | |\ \ \ \ | |||
| | | * | | | | Objects Tray - Move back to binding view | Eric Guzman | 2012-06-18 |
| | | | | | | | |||
| | | * | | | | Binding - Show tray when there are objects. Edit binding view css update. | Eric Guzman | 2012-06-18 |
| | | | | | | | |||
| | | * | | | | Objects Tray - Moved to stage object from binding view | Eric Guzman | 2012-06-15 |
| | | | | | | | |||
| | * | | | | | Binding - Drop Locate connector | Armen Kesablyan | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | Binding View - validate over huds | Armen Kesablyan | 2012-06-18 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-15 |
| | |\ \ \ \ | |||
| | | * | | | | Put Objects in front of Huds | Armen Kesablyan | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-15 |
| | | |\ \ \ \ | |||
| | | * | | | | | Binding Hud: Calling Option Selection to view | Armen Kesablyan | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | Objects Tray - Add hiding based on workspace mode. | Eric Guzman | 2012-06-15 |
| | | |/ / / / | |/| | | | | |||
| | * | | | | | Objects Tray - Add objects tray to binding view | Eric Guzman | 2012-06-15 |
| | |/ / / / | |||
| | * | | | | Binding-Huds draw to component | Armen Kesablyan | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | Merge pull request #12 from ericguzman/binding | Armen Kesablyan | 2012-06-13 |
| | |\ \ \ \ | | | | | | | | | | | | | Binding Panel update | ||
| | | * | | | | Binding View - Use same icon component as objects panel | Eric Guzman | 2012-06-12 |
| | | | | | | | |||
| | * | | | | | Binding-View: Translate huds | Armen Kesablyan | 2012-06-13 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-11 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-11 |
| | | |\ \ \ | |||
| | | * | | | | Initial Text Tool Changes | Armen Kesablyan | 2012-06-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | Binding-View : Deselect Works Now, Rendering multiple Huds Available | Armen Kesablyan | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||