aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
|\ | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * CSS Panel - Update components to use new serialization formatEric Guzman2012-05-22
| |
| * CSS Style Component - Moved unit identification to local change handler ↵Eric Guzman2012-05-21
| | | | | | | | instead of delegate
| * CSS Panel - Allow ":" to be used in selector fieldEric Guzman2012-05-21
| |
| * Style sheets view - Fixed drawing of toolbar and "no sheets" messageEric Guzman2012-05-21
| |
| * Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
| |\ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-18
| | |\
| | | * fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Fixing radio control in the PI.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fixed Materials Popup to work with new changes to repetition bindings.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | File Input control in materials panel was not working because of the change ↵Nivesh Rajbhandari2012-05-18
| | |/ | | | | | | | | | | | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * fixed the shape subtool not refreshing the iconValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * enabling basic document switchingValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Editable - Trigger change event after stop eventEric Guzman2012-05-17
| | |
| * | Merge branch 'dom-architecture' of ↵Eric Guzman2012-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 Rajbhandari2012-05-17
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-17
| | |\
| | * | Fixed border radius hot-text linking that was broken by update to montage v.10.Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
| |\ \ \
| * | | | Editable - remove formatting on pasteEric Guzman2012-05-17
| | | | |
| * | | | CSS Panel - Fix errors from new Montage and remove logs.Eric Guzman2012-05-10
| | | | |
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
| * | | | | Panel Toolbar - Support hiding and showing of buttonsEric Guzman2012-05-03
| | | | | |
| * | | | | CSS Panel - Add focus management to styles view delegateEric Guzman2012-05-02
| | | | | |
| * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-30
| |\ \ \ \ \
| * | | | | | Tree Controller -Delegate getter/setterEric Guzman2012-04-30
| | | | | | |
| * | | | | | Editable - Add paste event handling/dispatchingEric Guzman2012-04-30
| | | | | | |
| * | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Toolbar - Add buttons to toolbar componentEric Guzman2012-04-23
| | | | | | | | | |
| * | | | | | | | | Editable - Pass event data with stop eventEric Guzman2012-04-23
| | | | | | | | | |
| * | | | | | | | | CSS Style - Add disabled UI state. Added Hintable and editable UI state.Eric Guzman2012-04-11
| | | | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CSS Panel - Stylesheet edit modeEric Guzman2012-04-03
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-16
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
| * | | | | | | | | | | | | | | | | Tree Node Component - Added method for handling source object setEric Guzman2012-03-12
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | CSS Panel - Updating components, created toolbar components, and small ↵Eric Guzman2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes to styles controller
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | | fixing the breadcrumbValerio Virgillito2012-05-17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | | Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |