| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #323 from dhg637/binding | Valerio Virgillito | 2012-06-26 |
| |\ | | | | | Binding View - Binding Tool & Binding Panel | ||
| | * | Binding View - Objects Replace existing source Object if it exists | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-25 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-21 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * \ \ | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| | |\ \ \ | |||
| | * | | | | Objects Tray - Filter list of components for those without visual representation | Eric Guzman | 2012-06-20 |
| | | | | | | |||
| | * | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| | |\ \ \ \ | |||
| | | * | | | | Binding View - Mouse Over Element Pop up Hud | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | Objects Tray - Show only "off stage" objects | Eric Guzman | 2012-06-19 |
| | |/ / / / | |||
| | * | | | | 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> | ||
| | * | | | | | Objects Controller - Fix call to get current object bindings after ↵ | Eric Guzman | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | add/removing binding | ||
| | * | | | | | Objects Controller - Update current object bindings when adding/removing ↵ | Eric Guzman | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | bindings | ||
| | * | | | | | Objects Controller - Add concept of categories | Eric Guzman | 2012-06-12 |
| | | | | | | | |||
| | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-11 |
| | |\ \ \ \ \ | |||
| | | * | | | | | Changes Made to Object Listing of iFrame | Armen Kesablyan | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | 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 - Add component icon and icons by type | 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 |
| | | | | | | | | |||
| | * | | | | | | 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> | ||
| | * | | | | | | Binding Panel - Add getPropertyList and fix null currentObject | Eric Guzman | 2012-06-05 |
| | | | | | | | | |||
| | * | | | | | | Objects Controller - Fix access to the oneway property | Eric Guzman | 2012-06-01 |
| | | | | | | | | |||
| | * | | | | | | Binding Panel - Item css and toggle button action handler | Eric Guzman | 2012-06-01 |
| | | | | | | | | |||
| | * | | | | | | Bindings Panel - Update binding panel components | Eric Guzman | 2012-06-01 |
| | | | | | | | | |||
| | * | | | | | | Objects Controller - Add bindable controller properties, and bindings getter | Eric Guzman | 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 |
| | | |\ \ \ \ \ \ | |||
| | * | | | | | | | | Objects Controller - Now keeps track of document's object instances, ↵ | Eric Guzman | 2012-05-25 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | including added components | ||
| | * | | | | | | | 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> | ||
| | * | | | | | | | | Changes to binding view | Armen Kesablyan | 2012-05-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||
| | * | | | | | | | | | Objects Panel - Add Objects controller and montage/application hack to ↵ | Eric Guzman | 2012-05-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expose template | ||
| | * | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Make stage transparent when rotating/zooming templates and draw an outline ↵ | Nivesh Rajbhandari | 2012-06-22 |
| | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around the user's root instead. Also, fixed the background color setting on banner and animation templates' "body." Stage outline draws using drawGridLines code so it can show intersection with element planes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
| | * | | | | | | | | | | remove old method | Jonathan Duran | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | | | | remove unneeded files | Jonathan Duran | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-18 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | Timeline: Replace currentSelectedContainer with new model.domContainer. | Jon Reid | 2012-06-15 |
| | | | | | | | | | | | | | |||