aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
|\
| * Re-adding stage mouse wheel scrollingValerio Virgillito2012-02-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-14
| |\ | | | | | | | | | integration
| | * appended function : toViewportCoordinates in stageArmen Kesablyan2012-02-13
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Cleaning up requiresJose Antonio Marquez2012-02-14
| | | |
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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 Sen2012-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 Sen2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | document dirty indicator. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | | Merged old FileIOJose Antonio Marquez2012-01-27
| | | |
* | | | Fix for not being able to select an element in Top/Side view.Nivesh Rajbhandari2012-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 Kesablyan2012-02-07
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
| * | Integrating Pan and Zoom tool and snap manager fixes.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixed grid not drawing bug when switching from front to top and side.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Syncing stage view when rotating stage.Nivesh Rajbhandari2012-01-30
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Refactored rich text editor locationArmen Kesablyan2012-02-07
| |
* | Initial Text Tool ImplementationArmen Kesablyan2012-02-02
|/ | | | Has rich-text-editor in place need to place with finalized version when complete
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>