Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-19 |
|\ | |||
| * | first iteration of adding serializable to ninja plus other changes to run ↵ | Valerio Virgillito | 2012-06-06 |
| | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Initial Text Tool Changes | Armen Kesablyan | 2012-06-05 |
|/ | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | First round of moving color chips into the sub tools. Shape and Pen tool now ↵ | John Mayhew | 2012-05-03 |
| | | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools. | ||
* | 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> |