aboutsummaryrefslogtreecommitdiff
path: root/js/stage
Commit message (Collapse)AuthorAge
* 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>
| * 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
| * 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
* | Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-02-02
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into staging Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Base.scss css/ninja.css Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Switching to alternate dashed line function. Adding code attributions.Valerio Virgillito2012-02-02
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | 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>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-27 09:39:51 +0000