Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | BSD License | Kris Kowal | 2012-07-09 |
| | |||
* | Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internal | Valerio Virgillito | 2012-07-09 |
|\ | | | | | | | | | | | | | Conflicts: js/components/tools-properties/text-properties.reel/text-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Bug: Font Name & Size not updating text tool | Armen Kesablyan | 2012-07-02 |
| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
|/ | |||
* | Adding transparent background to color chip buttons | Jose Antonio Marquez | 2012-06-20 |
| | | | | Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge. | ||
* | -added new images for the text tool options | John Mayhew | 2012-05-15 |
| | | | | | -simplified text options CSS -fixed styling to accommodate new images | ||
* | -Consolidated many redundant css classes used in the tool options bars | John Mayhew | 2012-05-09 |
| | |||
* | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 |
|\ | | | | | | | integration | ||
| * | 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 |
| | | |||
| * | 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> |