aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
|\
| * reverting old pi dataValerio Virgillito2012-03-09
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
|\|
| * Merge pull request #106 from joseeight/ColorValerio Virgillito2012-03-09
| |\ | | | | | | Color Gradient Fix
| | * Temp Gradient FixJose Antonio Marquez2012-03-09
| | | | | | | | | | | | Temporary fix for getting gradient mode.
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| | |\ | | |/ | |/|
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-02-29
| | |\ | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| | * \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-28
| | |\ \
| | * \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-16
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug FixesJose Antonio Marquez2012-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
| | * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-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 ColorJose Antonio Marquez2012-02-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-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/NiveshColorJose Antonio Marquez Russo2012-02-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1 from mqg734/NiveshColorJose Antonio Marquez Russo2012-01-31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated color code to handle shapes.
* | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | integrating v0.7 montage into ninjaValerio Virgillito2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist
| | * | | | | | | | | | | | | | | | | | | | Disabled State is now darkerArmen Kesablyan2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | | | | | | | | | | | | Z-Index issue of disabled state with file open dialogArmen Kesablyan2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | | | | | | | | | | | | Disabled state for panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |