Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-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 AllFixes | Nivesh Rajbhandari | 2012-04-24 |
| | |\ | |||
| | * | | Allow users to toggle application of stroke and border settings when using ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 |
| |\ \ \ | | | |/ | | |/| | |||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| * \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-04 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| * \ \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-03 |
| |\ \ \ \ \ | |||
| * | | | | | | render the pen path with local coordinates, but use stage world coordinates ↵ | Pushkar Joshi | 2012-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 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||
| * | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| * | | | | | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-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 Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | | 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/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-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 mode | Eric Guzman | 2012-04-03 |
| | | | | | |||
* | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 |
|\| | | | | |||
| * | | | | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 |
| |\ \ \ \ | | | |_|/ | | |/| | | Brushtool | ||
| | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 |
| | |\ \ \ \ \ | |||
| | * | | | | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 |
| | | | | | | | | | |||
| | * | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-12 |
| | |\ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| | * | | | | | | | | fixed logical error in triggering menu item | Ananya Sen | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | - removed menu-data boundObj path support for now | Ananya Sen | 2012-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 rendering | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | file picker - added size unit | Ananya Sen | 2012-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 Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | window resize Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents open | Ananya Sen |