aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
|\ | | | | Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
| * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| |\
| * | Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'master' into pentoolPushkar Joshi2012-04-24
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\|
| | * cleanup unused code.Valerio Virgillito2012-04-19
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | initial stage web templateValerio Virgillito2012-04-18
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\| | | | | | | | | Conflicts: js/tools/PenTool.js
| * 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 'master' into pentoolPushkar Joshi2012-04-04
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: js/tools/PenTool.js
| * | | 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>
* | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
|\| | |
| * | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ | | | | | | | | | | Brushtool
| * \ \ \ 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>
* | | | | render the pen path with local coordinates, but use stage world coordinates ↵Pushkar Joshi2012-04-02
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
|\| | |
| * | | 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 branch 'master' into brushtoolPushkar Joshi2012-03-27
|\| | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * | | 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * / Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
|\|
| * adding a focus manager to handle panel bugs where blur was not getting ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
|\|
| * Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| |\ | | | | | | Presets panel - Ninja-leaf hover state
| | * Presets Panel - Remove :active pseudo class from ninja-leafEric Guzman2012-03-13
| | |
| | * Presets Panel - Add :active pseudo class for ninja-treeEric Guzman2012-03-13
| | |
| | * Presets Panel - Adding hover state to ninja-leafEric Guzman2012-03-13
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 17:13:16 +0000