Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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> | ||
* | Squashed commit of SnapManagerFixes | Valerio Virgillito | 2012-03-16 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Fixing the splitter resize canvas bug by getting the size when a document is ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | adding a focus manager to handle panel bugs where blur was not getting ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'FileIO-Build-Candidate' of ↵ | Valerio Virgillito | 2012-02-27 |
|\ | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate | ||
| * | refresh draw-utils, snap-manager, view-utils for html document stitching | Ananya Sen | 2012-02-23 |
| | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| | |\ | |||
| | * | | Enabling outline on open documents and parsing doom on open to create models. | Valerio Virgillito | 2012-02-23 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵ | Ananya Sen | 2012-02-23 |
| |/ / | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | / | Distinguish between border top/right/bottom/left colors. Also, fall back to ↵ | Nivesh Rajbhandari | 2012-02-24 |
| |/ |/| | | | | | | | | | snapping routine when selecting only if the active tool allows snapping. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 |
|\| | |||
| * | formatting and removing un-used code from the stage | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Some more tweaks to not being able to select elements in top/side view. | Nivesh Rajbhandari | 2012-02-20 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
|\| | |||
| * | Re-adding stage mouse wheel scrolling | Valerio Virgillito | 2012-02-17 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
| |\ | | | | | | | | | | integration | ||
| | * | appended function : toViewportCoordinates in stage | Armen Kesablyan | 2012-02-13 |
| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Cleaning up requires | Jose Antonio Marquez | 2012-02-14 |
| | | | |||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | ||
| * | | | fixed undo/redo for each code view document, changed new file integration ↵ | Ananya Sen | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | with io mediator Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | integrated save for the document tabs, detect codemirror history to show ↵ | Ananya Sen | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | document dirty indicator. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | ||
| * | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| | | | | |||
* | | | | Fix for not being able to select an element in Top/Side view. | Nivesh Rajbhandari | 2012-02-14 |
| |_|/ |/| | | | | | | | | | | | | | | Fall back to use SnapManager code if elementFromPoint returns the viewport. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Armen Kesablyan | 2012-02-07 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css | ||
| * | | Integrating Pan and Zoom tool and snap manager fixes. | Nivesh Rajbhandari | 2012-02-02 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Fixed grid not drawing bug when switching from front to top and side. | Nivesh Rajbhandari | 2012-01-30 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Syncing stage view when rotating stage. | Nivesh Rajbhandari | 2012-01-30 |
| |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* / | Initial Text Tool Implementation | Armen Kesablyan | 2012-02-02 |
|/ | | | | Has rich-text-editor in place need to place with finalized version when complete | ||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |