Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
|\ | | | | | | | integration | ||
| * | Fixed binding to font size dropdown | Armen Kesablyan | 2012-02-13 |
| | | |||
| * | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵ | Armen Kesablyan | 2012-02-13 |
| | | | | | | | | and numbered now bound to text tool | ||
* | | 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 | ||
| * | More Text Tool Updates | Armen Kesablyan | 2012-02-09 |
| | | |||
| * | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 |
| | | |||
| * | Initial Text tool completion. | Armen Kesablyan | 2012-02-07 |
| | | |||
* | | 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> |