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> | |||
| | * | | | | | | | | | | | Objects Panel - CSS and serialization update | Eric Guzman | 2012-06-11 | |
| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | Objects Panel - Add component icon and icons by type | Eric Guzman | 2012-06-11 | |
| | |/ / / / / / / / / / | ||||
| | * | | | | | | | | | | 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 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | 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 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | 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 Panel - Add getPropertyList and fix null currentObject | Eric Guzman | 2012-06-05 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Binding Panel - Add edit view | Eric Guzman | 2012-06-04 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Binding Panel - Button CSS | Eric Guzman | 2012-06-02 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Binding Panel - Item css and toggle button action handler | Eric Guzman | 2012-06-01 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Binding Panel - Binding item component CSS change | Eric Guzman | 2012-06-01 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Bindings Panel - Update binding panel components | Eric Guzman | 2012-06-01 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Binding Panel - Developed panel components. | Eric Guzman | 2012-05-31 | |
| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-05-31 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-05-30 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-05-25 | |
| | |\| | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-25 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Object Component - Enable native dragging | Eric Guzman | 2012-05-25 | |
| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Object component - Minor cleanup | Eric Guzman | 2012-05-25 | |
| | |/ / / / / / / / / / / / | ||||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * | | | | | | | | | | | | | | Removed Old Objects Panel Structure | Armen Kesablyan | 2012-05-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * | | | | | | | | | | | | | | Objects Panel - Add object component | Eric Guzman | 2012-05-16 | |
| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'dom-architecture' of ↵ | Armen Kesablyan | 2012-05-15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/masterDomArc' into binding | Armen Kesablyan | 2012-05-14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | Workspace: has customized | Armen Kesablyan | 2012-05-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * | | | | | | | | | | | | | | | | created the initial environment requirements for workspace to be manipulated. | Armen Kesablyan | 2012-05-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
* | | | | | | | | | | | | | | | | | | Bug Fix: Fix Animation for Position & Size Props | Kruti Shah | 2012-06-27 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-26 | |
|\| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | |