| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\ | |||
| | * | 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> | ||
| | | * | disable more menus if the active document is not in design view | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | 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> | ||
| | | * | KNINJA-1302 : refactored fixed as per request | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | IKNINJA-1302 : close on ESC even if text field is focussed | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵ | Ananya Sen | 2012-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 Sen | 2012-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 rendering | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | IKNINJA-1302 : more fix | 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> | ||
| | | * | IKNINJA-1302 : For File>New and File>SaveAll dialogs, 'ESC' key now ↵ | Ananya Sen | 2012-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 open | Ananya Sen | 2012-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/PresetsPI | Valerio Virgillito | 2012-03-28 |
| | |\ \ | | | | | | | | | Presets - Adding presets controller | ||
| | | * | | Text Tool - Remove inline style from user document | Eric Guzman | 2012-03-27 |
| | | | | | |||
| | | * | | Presets Controller - Removing test background from transition class | Eric Guzman | 2012-03-27 |
| | | | | | |||
| | | * | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 |
| | | |\ \ | |||
| | | * | | | Presets Panel - Adding presets controller to serialization | Eric Guzman | 2012-03-22 |
| | | | | | | |||
| | | * | | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
| | | | |/ | | |/| | | | | | | | | | panel code | ||
| | * | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ | | | | | | | | | | | Resizers refactoring | ||
| | | * | | | minor glitch in calculations in snap code | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | Removing old code | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-22 |
| | | |\| | | |||
| | | * | | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-19 |
| | | |\ \ \ | |||
| | | * | | | | Initial Data Binding Mediator | Armen Kesablyan | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | Merge pull request #146 from mqg734/WebGLFileIO | Valerio Virgillito | 2012-03-27 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fixes for Line Tool and EyeDropper tool runtime error. | ||
| | | * \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-27 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | * | | | | | | Merge pull request #144 from mqg734/WebGLFileIO | Valerio Virgillito | 2012-03-27 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | WebGL Fixes and Minor EyeDropper Tool Fixes. | ||
| | | | * | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail. | Nivesh Rajbhandari | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Check for webGLWorld before calling draw. | Nivesh Rajbhandari | 2012-03-27 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Merge branch 'refs/heads/montage-integration' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-26 |
| | |/| | | | | |||
| | | * | | | | Fixed issue with WebGL materials not working after file-save or ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Updating EyeDropper tool to support new JSON data format for WebGL. | Nivesh Rajbhandari | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Color Bug Fix | ||
| | | * | | | | Fix: IKNINJA-1355 | Jose Antonio Marquez | 2012-03-26 |
| | | | | | | | |||
| | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-26 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | | * | | | | Fix: IKNINJA-1362 | Jose Antonio Marquez | 2012-03-26 |
| | | | | | | | |||
| | * | | | | | Merge pull request #141 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-24 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Changing where we check for _previewAnimation flag. | ||
| | | * | | | | | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox | Nivesh Rajbhandari | 2012-03-24 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | * | | | | | | Merge pull request #140 from ericmueller/integration | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Integration | ||
| | | * | | | | | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'montage-integration' of ↵ | hwc487 | 2012-03-23 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration Conflicts: js/io/system/ninjalibrary.json | ||
| | * | | | | | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | I/O Fixes | ||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-23 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||