Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-31 |
|\ | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | 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. | ||
| * | 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 |
| | |\ | |||
| | | * | fixing the breadcrumb | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | 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> | ||
| | * | Adding a disabled property to the label-checkbox. | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing a null value for the document entry bar | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | fixing the menu binding resulting in 1 === true > false | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-16 |
| | |\ \ | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | | * | | document close handler. initial working draft | Valerio Virgillito | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | adding some test converters | Valerio Virgillito | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | code cleanup | Valerio Virgillito | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | adding a converter for the hot text | Valerio Virgillito | 2012-05-11 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Removing the old checkbox components. Created a new LabelCheckbox | Valerio Virgillito | 2012-05-16 |
| | |/ / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵ | Valerio Virgillito | 2012-05-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 |
| | |\ \ | |||
| | * \ \ | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 |
| | |\ \ \ | |||
| | * | | | | Fixing bindings to new model | Jose Antonio Marquez | 2012-05-01 |
| | | | | | | |||
| * | | | | | 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 |
| | | | | | | | | |