aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
|\
| * 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>
| * | 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>
| * | | | | 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>
| * | | | | 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>
| | * | | | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBoxNivesh Rajbhandari2012-03-24
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #140 from ericmueller/integrationValerio Virgillito2012-03-23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Integration
| | * | | | | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | | | | | | |
| | * | | | | | Merge branch 'montage-integration' of ↵hwc4872012-03-23
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration Conflicts: js/io/system/ninjalibrary.json
| * | | | | | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | I/O Fixes
| | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-23
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components