| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| |\ | |||
| | * | reverting old pi data | Valerio Virgillito | 2012-03-09 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| |\| | |||
| | * | Merge pull request #106 from joseeight/Color | Valerio Virgillito | 2012-03-09 |
| | |\ | | | | | | | Color Gradient Fix | ||
| | | * | Temp Gradient Fix | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | | | | | Temporary fix for getting gradient mode. | ||
| | | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-09 |
| | | |\ | | |/ | |/| | |||
| | | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-02-29 |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | | * \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-28 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-23 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-22 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-21 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | | |\ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-16 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-15 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144 | ||
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js | ||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-04 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-02 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js | ||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #2 from mqg734/NiveshColor | Jose Antonio Marquez Russo | 2012-02-01 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes. | ||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-01 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1 from mqg734/NiveshColor | Jose Antonio Marquez Russo | 2012-01-31 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated color code to handle shapes. | ||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| |\| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-09 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-08 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | | | | | | | | | integrating v0.7 montage into ninja | Valerio Virgillito | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js | ||
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/Panels | Valerio Virgillito | 2012-03-08 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist | ||
| | | * | | | | | | | | | | | | | | | | | | | | Disabled State is now darker | Armen Kesablyan | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | | | | | | | | | | | | | | Z-Index issue of disabled state with file open dialog | Armen Kesablyan | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | | | | | | | | | | | | | | Disabled state for panels | Armen Kesablyan | 2012-03-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||