aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-21
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation
| | * | | | | | | | | | | | Flow doesn't reset to origin 0 when changing the feedFrançois Frisch2012-03-21
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Making flow flat on stageFrançois Frisch2012-03-21
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Feed Reader - Remove hard-coded font color for feed readerEric Guzman2012-03-21
| | | | | | | | | | | | |
| * | | | | | | | | | | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #129 from mqg734/WebGLMaterialsValerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Added Montage button as a valid PI control and used it to invoke the edit material popup.
| | * | | | | | | | | | | Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _planesArray's length to 0 instead of setting the arrays to null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | / / / / / / | |_|_|_|_|/ / / / / / |/| | | | | | | | | | montage-integration
| * | | | | | | | | | Initializing carousel in middle positionFrançois Frisch2012-03-20
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * | | | | | | | | | changing the RSS reader default sized and padding.Valerio Virgillito2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation
| * | | | | | | | | | | Feed Reader - Fix reference closure'd "this"Eric Guzman2012-03-20
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | montage-integration
| * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation
| | * | | | | | | | | | | Feed Reader - change default display mode to "timer"Eric Guzman2012-03-20
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalEric Guzman2012-03-20
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Feed Reader - Add PI field for display modeEric Guzman2012-03-20
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Presets - Animation updateEric Guzman2012-03-20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Removing the youtube channel video black backgroundValerio Virgillito2012-03-20
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |