| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| |\ | |||
| | * | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-19 |
| | |\ | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | Tests and clean-up | Jose Antonio Marquez | 2012-03-18 |
| | | | | |||
| | * | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-18 |
| | |\ \ | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | | Temp I/O functionality for M-JS components | Jose Antonio Marquez | 2012-03-18 |
| | | | | | | | | | | | | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional. | ||
| * | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | montage-integration | ||
| | * \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-21 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | | * | | | | Flow doesn't reset to origin 0 when changing the feed | François Frisch | 2012-03-21 |
| | | | | | | | |||
| | | * | | | | Making flow flat on stage | François Frisch | 2012-03-21 |
| | | | | | | | |||
| | * | | | | | Feed Reader - Remove hard-coded font color for feed reader | Eric Guzman | 2012-03-21 |
| | | | | | | | |||
| | * | | | | | Presets Panel - Add Font style preset | Eric Guzman | 2012-03-21 |
| | |/ / / / | |||
| * | | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 |
| |\ \ \ \ \ | |||
| | * \ \ \ \ | Merge pull request #129 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-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 Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Support edit material button in oval and line PI. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | montage-integration | ||
| | * | | | | | Initializing carousel in middle position | François Frisch | 2012-03-20 |
| | | | | | | | |||
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * | | | | | changing the RSS reader default sized and padding. | Valerio Virgillito | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-20 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | * | | | | | | Feed Reader - Fix reference closure'd "this" | Eric Guzman | 2012-03-20 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | montage-integration | ||
| | * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal | Valerio Virgillito | 2012-03-20 |
| | |\| | | | | | |||
| | | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-20 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | | * | | | | | | Feed Reader - change default display mode to "timer" | Eric Guzman | 2012-03-20 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal | Eric Guzman | 2012-03-20 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Feed Reader - Add PI field for display mode | Eric Guzman | 2012-03-20 |
| | | | | | | | | | | |||
| | | * | | | | | | | Presets - Animation update | Eric Guzman | 2012-03-20 |
| | | | | | | | | | | |||
| | * | | | | | | | | Removing the youtube channel video black background | Valerio Virgillito | 2012-03-20 |
| | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | | * | | | | | | Reset the animation event handlers/timer when the display mode changes. | Kishore Subramanian | 2012-03-20 |
| | | |/ / / / / | |||
| | * | | | | | | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | giving the feed reader a default size when empty | Valerio Virgillito | 2012-03-20 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Animation for the Feed reader | Kishore Subramanian | 2012-03-20 |
| | | | | | | | |||
| | * | | | | | Change Youtube channel transition to avoid rendering bug | Stuart Knightley | 2012-03-20 |
| | | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/button-switch' into montage-integration | Valerio Virgillito | 2012-03-20 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | montage-integration | ||
| | * | | | | | Reformating carousel | François Frisch | 2012-03-19 |
| | | | | | | | |||
| | * | | | | | Update manifest to remove youtube | Stuart Knightley | 2012-03-19 |
| | | | | | | | |||
| | * | | | | | Need to allow youtube.com content in Ninja's manifest. Note you will have to ↵ | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reload the Ninja extension. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * | | | | | Preserve-3d on flow and specify default dimensions on picasa-carousel. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||