aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
...
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-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 optionsJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images
| | * | | | | | | | | | | | | | | updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed its use of the sprite sheet
| | * | | | | | | | | | | | | | | Add color to tag toolValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | | | | -fixed spacing problem in the tag toolJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -implemented the new mode radio buttons for the pen tool
| | * | | | | | | | | | | | | | | -changed tool options radio button class to match the styling of the shape ↵John Mayhew2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |