aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
...
* | | | | | | | 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/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ↵Nivesh Rajbhandari2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | CSS Panel - Stylesheet edit modeEric Guzman2012-04-03
| | | | | | |
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
|\| | | | | |
| * | | | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | | Brushtool
| | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| | * | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | | | | | |
| | * | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| | |\ \ \ \ \ \
| | * | | | | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| | * | | | | | | | fixed logical error in triggering menu itemAnanya Sen2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | - removed menu-data boundObj path support for nowAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed error on clicking on disabled menu item Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | file picker - added size unitAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file - don't disable OK is file exists Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | IKNINJA-1266 : restrict tab size for long file names and resize tabs on ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | window resize Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | Resizers refactoring
| | * | | | | | | Resizers updatedArmen Kesablyan2012-03-23
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ...
| | | * | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵Ananya Sen2012-03-16
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding enabled/disabled support for PI"s checkbox controls, and using that capability for WebGL animate checkbox.
| | * | | | | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |