| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-25 |
| |\ | |||
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| | | * | adding document views checks for the timeline and breadcrumb | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| | |/ | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
| * | | 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> | ||
| | * | CSS Panel - Update components to use new serialization format | Eric Guzman | 2012-05-22 |
| | | | |||
| | * | CSS Style Component - Moved unit identification to local change handler ↵ | Eric Guzman | 2012-05-21 |
| | | | | | | | | | instead of delegate | ||
| | * | CSS Panel - Allow ":" to be used in selector field | Eric Guzman | 2012-05-21 |
| | | | |||
| | * | Style sheets view - Fixed drawing of toolbar and "no sheets" message | Eric Guzman | 2012-05-21 |
| | | | |||
| | * | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-18 |
| | |\ | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates | ||
| | | * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-18 |
| | | |\ | |||
| | | | * | fixing the color chip for the document root | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Fixing radio control in the PI. | Nivesh Rajbhandari | 2012-05-18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Fixed Materials Popup to work with new changes to repetition bindings. | Nivesh Rajbhandari | 2012-05-18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | File Input control in materials panel was not working because of the change ↵ | Nivesh Rajbhandari | 2012-05-18 |
| | | |/ | | | | | | | | | | | | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | fixed the shape subtool not refreshing the icon | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | enabling basic document switching | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Editable - Trigger change event after stop event | Eric Guzman | 2012-05-17 |
| | | | | |||
| | * | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-17 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js | ||
| | | * | Removed unneeded identifier. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-17 |
| | | |\ | |||
| | | * | | Fixed border radius hot-text linking that was broken by update to montage v.10. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 |
| | |\ \ \ | |||
| | * | | | | Editable - remove formatting on paste | Eric Guzman | 2012-05-17 |
| | | | | | | |||
| | * | | | | CSS Panel - Fix errors from new Montage and remove logs. | Eric Guzman | 2012-05-10 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-10 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | ||
| | * | | | | | Panel Toolbar - Support hiding and showing of buttons | Eric Guzman | 2012-05-03 |
| | | | | | | | |||
| | * | | | | | CSS Panel - Add focus management to styles view delegate | Eric Guzman | 2012-05-02 |
| | | | | | | | |||
| | * | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-30 |
| | |\ \ \ \ \ | |||
| | * | | | | | | Tree Controller -Delegate getter/setter | Eric Guzman | 2012-04-30 |
| | | | | | | | | |||
| | * | | | | | | Editable - Add paste event handling/dispatching | Eric Guzman | 2012-04-30 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-26 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Toolbar - Add buttons to toolbar component | Eric Guzman | 2012-04-23 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Editable - Pass event data with stop event | Eric Guzman | 2012-04-23 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | CSS Style - Add disabled UI state. Added Hintable and editable UI state. | Eric Guzman | 2012-04-11 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-09 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | CSS Panel - Stylesheet edit mode | Eric Guzman | 2012-04-03 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js | ||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | ||
| | * | | | | | | | | | | | | | | | | | Tree Node Component - Added method for handling source object set | Eric Guzman | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | CSS Panel - Updating components, created toolbar components, and small ↵ | Eric Guzman | 2012-03-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes to styles controller | ||
| * | | | | | | | | | | | | | | | | | | 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> | ||
| | * | | | | | | | | | | | | | | | | | fixing the breadcrumb | Valerio Virgillito | 2012-05-17 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||