Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
|\ | |||
| * | Bug Fixes | Jose Antonio Marquez | 2012-02-13 |
| | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144 | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 |
|\| | |||
| * | Update grid and planes when elementChange event signifies the "matrix", ↵ | Nivesh Rajbhandari | 2012-02-03 |
| | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/NiveshColor' into ToolFixes | Nivesh Rajbhandari | 2012-02-03 |
| |\ | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Updated color code in the PI to go through element mediator. | Nivesh Rajbhandari | 2012-02-01 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | IKNINJA-1083 | Jose Antonio Marquez | 2012-01-30 |
| | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | ||
| * | | Fixed the color popups to work with m-js v6 | Jose Antonio Marquez | 2012-02-02 |
| | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified. | ||
| * | | IKNINJA-1083 | Jose Antonio Marquez | 2012-02-01 |
| |/ | | | | | | | Fixing minor bug with no color breaking on null alpha value. | ||
* / | 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> |