| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | | | | | | | 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> | |||
| | | * | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-11 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #11 from ericguzman/binding | Armen Kesablyan | 2012-06-11 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | Binding | |||
| | | | | * | | | | | | | | | | Binding Panel - fix scrollbar issue with abs positioned edit view. | Eric Guzman | 2012-06-11 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Edit View - Add buttons and calls controller (saves bindings) | Eric Guzman | 2012-06-11 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Item - Direction Toggle button calls controller | Eric Guzman | 2012-06-11 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Controller - Allow currentBindings to update by resetting currentObject | Eric Guzman | 2012-06-11 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Panel - Direction toggle changes are savable. | Eric Guzman | 2012-06-10 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Panel - Minor Editing Panel changes | Eric Guzman | 2012-06-10 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Panel Toolbar - Add action handler | Eric Guzman | 2012-06-10 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Hintable - Array type check fix for arrays created with map() method. | Eric Guzman | 2012-06-10 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Panel - supply binding args to edit view | Eric Guzman | 2012-06-08 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Panel - Add toolbar | Eric Guzman | 2012-06-08 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Panel - Update edit view - populate binding arguments | Eric Guzman | 2012-06-08 | |
| | | | |/ / / / / / / / / / | ||||
| | | * / / / / / / / / / / | Binding-View : Deselect Works Now, Rendering multiple Huds Available | Armen Kesablyan | 2012-06-11 | |
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | * | | | | | | | | | | Render Hud Multiple | Armen Kesablyan | 2012-06-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | * | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-07 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/objects-controller.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | | * \ \ \ \ \ \ \ \ \ | Merge pull request #10 from ericguzman/binding | Armen Kesablyan | 2012-06-06 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding | |||
| | | | | * | | | | | | | | | | Objects Controller - Get serializable properties | Eric Guzman | 2012-06-06 | |
| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Changes to Binding View | Armen Kesablyan | 2012-06-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | * | | | | | | | | | | | | Object Controller | Armen Kesablyan | 2012-06-06 | |
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | * | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-05 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | Merge pull request #9 from ericguzman/binding | Armen Kesablyan | 2012-06-05 | |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding | |||
| | | | | * | | | | | | | | | | Binding Panel - Add getPropertyList and fix null currentObject | Eric Guzman | 2012-06-05 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | Binding Panel - Add edit view | Eric Guzman | 2012-06-04 | |
| | | | |/ / / / / / / / / / | ||||
| | | * | | | | | | | | | | | Changes for binding View | Armen Kesablyan | 2012-06-05 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | * | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-02 | |
| | | |\| | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Merge pull request #8 from ericguzman/binding | Armen Kesablyan | 2012-06-02 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding | |||
| | | | | * | | | | | | | | | | Binding Panel - Button CSS | Eric Guzman | 2012-06-02 | |
| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-02 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/bindingTool.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | | * | | | | | | | | | | | Merge pull request #7 from ericguzman/binding | Armen Kesablyan | 2012-06-02 | |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding Panel components css update | |||
| | | | | * | | | | | | | | | | Objects Controller - Fix access to the oneway property | Eric Guzman | 2012-06-01 | |
| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | ||||