aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | | | | | | | turn off the fill color for pen tool paths by defaultPushkar Joshi2012-03-13
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | reverting old pi dataValerio Virgillito2012-03-09
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | | 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 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | | | | | | | | | | | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | | | | | | | | | | | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | | | | | | | | | | | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-08
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge pull request #104 from ananyasen/integration-candidateValerio Virgillito2012-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing a video
| | | * | | | | | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | | | | | | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | / / / | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | Timeline uber
| | | * | | | | | | | | | | | | Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
| | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | | | | | | | | | | | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUberJonathan Duran2012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | * | | | | | | | | | | | Timeline: Storing Hashtable for element MappingKruti Shah2012-03-06
| | | | | | | | | | | | | | | |