| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ | Merge pull request #16 from ericguzman/binding | Armen Kesablyan | 2012-06-18 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Objects Tray - Moved to stage object from binding view | |||
| | | | | * | | | | | | | | | Objects Tray - Move back to binding view | Eric Guzman | 2012-06-18 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Edit Binding View - Improve how form is populated, cleared, and saved. | Eric Guzman | 2012-06-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up some logs. | |||
| | | | | * | | | | | | | | | Edit View - Minor cleanup | Eric Guzman | 2012-06-18 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Binding panel - Minor change on add button handler | Eric Guzman | 2012-06-18 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Hintable - Fix editable/hintable value property so it is bindable. | Eric Guzman | 2012-06-18 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Edit Binding View - Handle no object for icon | Eric Guzman | 2012-06-18 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Binding - Show tray when there are objects. Edit binding view css update. | Eric Guzman | 2012-06-18 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-16 | |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | ||||
| | | | | * | | | | | | | | | 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 pull request #15 from ericguzman/binding | Armen Kesablyan | 2012-06-15 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding | |||
| | | | * | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ | 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 | |
| | | | | |/ / / / / / / / / | ||||
| | | | | * | | | | | | | | | Merge pull request #14 from ericguzman/binding | Armen Kesablyan | 2012-06-15 | |
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding | |||
| | | | | * | | | | | | | | | Objects Panel - removed for now | Eric Guzman | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Objects Tray - Add objects tray to binding view | Eric Guzman | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-14 | |
| | | | | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Merge pull request #13 from ericguzman/binding | Armen Kesablyan | 2012-06-15 | |
| | | |/| | | | | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | Added Objects Tray | |||
| | | | * | | | | | | | | | Edit Binding - Binding improvements to show icon and save form | Eric Guzman | 2012-06-13 | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | Objects Panel - Fix CSS to simplify showing object icons in other panels | Eric Guzman | 2012-06-13 | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | Objects Controller - Fix call to get current object bindings after ↵ | Eric Guzman | 2012-06-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add/removing binding | |||
| | | * | | | | | | | | | ||||