aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | 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>
| * | | | | | | | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Presets - Adding presets controller
| * \ \ \ \ \ \ \ \ 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>
| * | | | | | | | | 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.
| | | * | | | | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail.Nivesh Rajbhandari2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | Check for webGLWorld before calling draw.Nivesh Rajbhandari2012-03-27
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/montage-integration' into WebGLFileIONivesh Rajbhandari2012-03-26
| |/| | | | | | | |
| | * | | | | | | | Fixed issue with WebGL materials not working after file-save or ↵Nivesh Rajbhandari2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Handle no-color/null.Nivesh Rajbhandari2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Updating EyeDropper tool to support new JSON data format for WebGL.Nivesh Rajbhandari2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets)
* | | | | | | | | 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
|\| | | | | | | |
| * | | | | | | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Color Bug Fix
| | * | | | | | | Fix: IKNINJA-1355Jose Antonio Marquez2012-03-26
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-26
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| | | | | | | | |
| * | | | | | | | Merge pull request #141 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Changing where we check for _previewAnimation flag.
| | * | | | | | | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com&