| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | 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 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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> | |||
| | | * | | | | | | | | | | | | | | | -added new images for the text tool options | John Mayhew | 2012-05-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images | |||
| | | * | | | | | | ||||