Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 | ||
| * | 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 | ||
| * | | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 |
| | | | |||
| * | | Initial Text Tool Implementation | Armen Kesablyan | 2012-02-02 |
| | | | | | | | | | | | | Has rich-text-editor in place need to place with finalized version when complete | ||
* | | | 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 | ||
| * | | 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> | ||
* / | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |