aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-04-03
|\
| * Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ | | | | | | added text paste detection and updated some menu items
| | * - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-03-30
| | | | | | | | | | | | | | | | | | - fixed logical error to trigger OK on Enter key pressed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * detect paste from context menu for new file and save as dialogAnanya Sen2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge pull request #151 from ericguzman/CSSPanel_AnimationDurationFixValerio Virgillito2012-03-30
| |\ \ | | | | | | | | CSS Panel - Fix animation duration value updates from "infinite" to int...
| | * | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| |/ /
| * | 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>
| | * | disable more menus if the active document is not in design viewAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | 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>
| | * | KNINJA-1302 : refactored fixed as per requestAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | IKNINJA-1302 : close on ESC even if text field is focussedAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | path includes the full filename Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | IKNINJA-1361: autofocus and auto-select file name on open of new file and ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | save as dialog 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>
| | * | IKNINJA-1302 : more fixAnanya 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>
| | * | IKNINJA-1302 : For File>New and File>SaveAll dialogs, 'ESC' key now ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triggers Cancel button and 'Enter' key now triggers OK button. For File picker, the 'ESC' now triggers the Cancel button. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-workflow-controller.js 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>
* | | | working File I/O for pen tool created paths and some minor bug fixes ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | (correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O)
* | | | track the canvas top left position instead of the center position to figure ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | out when to translate the subpath per canvas translation...this one seems to not drift (no floating point issues uncovered so far)
* | | | First attempt at preventing the drifting of the canvas due to floating point ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | roundoff errors when constantly changing stroke width
* | | | 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
* | | | adjust the position for the pen tool feedback cursor AND fix a bug where ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | everything selected gets deleted (even if we have a selected subpath)
* | | | change cursors for pen tool realtime feedback....still need to position the ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | cursors correctly over the exact mouse position AND reduce the radius (distance threshold) for picking paths
* | | | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-28
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| |\| |
| | * | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| | |\ \ | | | | | | | | | | Presets - Adding presets controller
| | | * | Text Tool - Remove inline style from user documentEric Guzman2012-03-27
| | | | |
| | | * | Presets Controller - Removing test background from transition classEric Guzman2012-03-27
| | | | |
| | | * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | | |\ \
| | | * | | Presets Panel - Adding presets controller to serializationEric Guzman2012-03-22
| | | | | |
| | | * | | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | | |/ | | | |/| | | | | | | | | | | panel code
| | * | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| | |\ \ \ | | | | | | | | | | | | Resizers refactoring
| | | * | | minor glitch in calculations in snap codeArmen Kesablyan2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Removing old codeArmen Kesablyan2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-22
| | | |\| |
| | | * | | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-19
| | | |\ \ \
| | | * | | | Initial Data Binding MediatorArmen Kesablyan2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | | | | | |
* | | | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ↵Pushkar Joshi2012-03-27
|/ / / / / / | | | | | | | | | | | | | | | | | | an anchor point or handles of thte selected anchor
* | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
|\| | | | |
| * | | | | Merge pull request #146 from mqg734/WebGLFileIOValerio Virgillito2012-03-27
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixes for Line Tool and EyeDropper tool runtime error.
| | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-27
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #144 from mqg734/WebGLFileIOValerio Virgillito2012-03-27
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | WebGL Fixes and Minor EyeDropper Tool Fixes.