aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | | | | | Render Hud MultipleArmen Kesablyan2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/objects-controller.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10 from ericguzman/bindingArmen Kesablyan2012-06-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding
| | | * | | | | | | | | | | | | | | | Objects Controller - Get serializable propertiesEric Guzman2012-06-06
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Changes to Binding ViewArmen Kesablyan2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | | | Object ControllerArmen Kesablyan2012-06-06
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Merge pull request #9 from ericguzman/bindingArmen Kesablyan2012-06-05
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding
| | | * | | | | | | | | | | | | | | | Binding Panel - Add getPropertyList and fix null currentObjectEric Guzman2012-06-05
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Binding Panel - Add edit viewEric Guzman2012-06-04
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Changes for binding ViewArmen Kesablyan2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-02
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge pull request #8 from ericguzman/bindingArmen Kesablyan2012-06-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding
| | | * | | | | | | | | | | | | | | | Binding Panel - Button CSSEric Guzman2012-06-02
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-02
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/bindingTool.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | | | | | | | | | Merge pull request #7 from ericguzman/bindingArmen Kesablyan2012-06-02
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding Panel components css update
| | | * | | | | | | | | | | | | | | | Objects Controller - Fix access to the oneway propertyEric Guzman2012-06-01
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Binding Panel - Item css and toggle button action handlerEric Guzman2012-06-01
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge pull request #6 from ericguzman/bindingArmen Kesablyan2012-06-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding Panel - Binding Item component CSS change and montage fix
| | | * | | | | | | | | | | | | | | | Binding Panel - Binding item component CSS changeEric Guzman2012-06-01
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Manually Add Fix for Montage serialization problemEric Guzman2012-06-01
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | binding canvasArmen Kesablyan2012-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-01
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge pull request #5 from ericguzman/bindingArmen Kesablyan2012-06-01
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding Panel components update
| | | * | | | | | | | | | | | | | | | Bindings Panel - Update binding panel componentsEric Guzman2012-06-01
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge pull request #4 from ericguzman/bindingArmen Kesablyan2012-05-31
| | |\ \ \ \ \ \ \ \