aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-18
|\
| * Merge pull request #16 from ericguzman/bindingArmen Kesablyan2012-06-18
| |\ | | | | | | Objects Tray - Moved to stage object from binding view
| | * Objects Tray - Move back to binding viewEric Guzman2012-06-18
| | |
| | * Edit Binding View - Improve how form is populated, cleared, and saved.Eric Guzman2012-06-18
| | | | | | | | | | | | Also cleaned up some logs.
| | * Edit View - Minor cleanupEric Guzman2012-06-18
| | |
| | * Binding panel - Minor change on add button handlerEric Guzman2012-06-18
| | |
| | * Hintable - Fix editable/hintable value property so it is bindable.Eric Guzman2012-06-18
| | |
| | * Edit Binding View - Handle no object for iconEric Guzman2012-06-18
| | |
| | * Binding - Show tray when there are objects. Edit binding view css update.Eric Guzman2012-06-18
| | |
| | * Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-16
| | |\ | | |/ | |/|
| | * Objects Tray - Moved to stage object from binding viewEric Guzman2012-06-15
| | |
* | | Binding - Drop Locate connectorArmen Kesablyan2012-06-18
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Binding View - validate over hudsArmen Kesablyan2012-06-18
|/ / | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Merge pull request #15 from ericguzman/bindingArmen Kesablyan2012-06-15
|\| | | | | Binding
| * Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-15
| |\ | |/ |/|
* | Put Objects in front of HudsArmen Kesablyan2012-06-15
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
|\ \
* \ \ Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
|\ \ \
* | | | Binding Hud: Calling Option Selection to viewArmen Kesablyan2012-06-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * Objects Tray - Add hiding based on workspace mode.Eric Guzman2012-06-15
| | |/
| | * Merge pull request #14 from ericguzman/bindingArmen Kesablyan2012-06-15
| |/| | | | | | | Binding
| | * Objects Panel - removed for nowEric Guzman2012-06-15
| | |
| | * Objects Tray - Add objects tray to binding viewEric Guzman2012-06-15
| | |
| | * Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-14
| | |\ | |_|/ |/| |
| * | Merge pull request #13 from ericguzman/bindingArmen Kesablyan2012-06-15
|/| | | |/ | | Added Objects Tray
| * Edit Binding - Binding improvements to show icon and save formEric Guzman2012-06-13
| |
| * Objects Panel - Fix CSS to simplify showing object icons in other panelsEric Guzman2012-06-13
| |
| * Objects Controller - Fix call to get current object bindings after ↵Eric Guzman2012-06-13
| | | | | | | | add/removing binding
* | Binding-Huds draw to componentArmen Kesablyan2012-06-14
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge pull request #12 from ericguzman/bindingArmen Kesablyan2012-06-13
|\ | | | | Binding Panel update
| * Binding Panel - Dock the edit view when transition ends so horizontal ↵Eric Guzman2012-06-13
| | | | | | | | resizing works
| * Objects Controller - Update current object bindings when adding/removing ↵Eric Guzman2012-06-13
| | | | | | | | bindings
| * Edit Binding - Update LayoutEric Guzman2012-06-13
| |
| * Binding Panel - set up new edit view layoutEric Guzman2012-06-12
| |
| * Binding View - Use same icon component as objects panelEric Guzman2012-06-12
| |
| * Components - Add object instance to model's objects arrayEric Guzman2012-06-12
| |
| * Objects Controller - Add concept of categoriesEric Guzman2012-06-12
| |
| * Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| |\
| * | Objects Panel - CSS and serialization updateEric Guzman2012-06-11
| | |
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| |\ \
| * | | Objects Panel - Add component icon and icons by typeEric Guzman2012-06-11
| | | |
* | | | Binding-View: Translate hudsArmen Kesablyan2012-06-13
| |_|/ |/| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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-internalArmen Kesablyan2012-06-11
| |\ \
| | * \ Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| | |\ \ | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white.
| | | * \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | | |\ \
| | | * | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the iframeContainer now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Overriding scrollbar styles on the template so the scroll track is not ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | white. This has the side benefit of fixing some of the zoom issues with the scrollbar too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Merge pull request #287 from joseeight/FileIOValerio Virgillito2012-06-11
| | |\ \ \ \ | | | |_|/ / | | |/| | | Re-adding temp doc type
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:43:39 +0000