Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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> | ||
* | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
|\| | | | | | | | | | | | montage-integration | ||
| * | | fixing the selection for the picasa carousel | Valerio Virgillito | 2012-03-19 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Update Youtube channel to have three thumbnails | Stuart Knightley | 2012-03-19 |
| | | | |||
* | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
|\| | | | | | | | | | | | montage-integration | ||
| * | | Map - width and height should be 100% so resize handles work. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | "Category" property should use "select" control. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Maps - Apply default width and height styles to components if specified. ↵ | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Changes to Map and FeedReader | Kishore Subramanian | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | - Added traffic property to Map - Support for show/hide traffic in the example - Changed FeedReader to use only one DIV. No longer uses Repetition - Support multiple modes in the Feed reader - timed/animated | ||
| * | | Changes to the Demo | Kishore Subramanian | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | - Feed Reader now shows one entry at a time - Category dropdown removed form the Map. It is included as part of the example code - Changed the categories that do not return results | ||
| * | | Update Youtube player to HTML5 | Stuart Knightley | 2012-03-19 |
| | | | |||
| * | | Youtube appending script in draw | François Frisch | 2012-03-19 |
| | | | |||
| * | | using channel name rather than url | François Frisch | 2012-03-18 |
| | | | |||
| * | | fixing the selection of components. Temporary workaround for now. | Valerio Virgillito | 2012-03-18 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | looping through both branches of the components tree | Valerio Virgillito | 2012-03-18 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-19 |
|\ \ \ | |/ / |/| / | |/ | |||
| * | Merge pull request #126 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-19 |
| |\ | | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset | ||
| | * | Presets Panel - Fix conflict with default transition presets | Eric Guzman | 2012-03-17 |
| | | | |||
| | * | Merge branch 'refs/heads/master' into AddAnimationsLibrary | Eric Guzman | 2012-03-17 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js | ||
| | * | | Presets Panel - Change Tab labels, Add Un-3d preset | Eric Guzman | 2012-03-16 |
| | | | | |||
| * | | | Merge pull request #128 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-03-19 |
| |\ \ \ | | |_|/ | |/| | | Replacing old button component with montage button component in our UI. | ||
| | * | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| |/ / | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | changing the picasa-carousel to use a getter and setter for the queryParameter | Valerio Virgillito | 2012-03-18 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal | Valerio Virgillito | 2012-03-17 |
|\ \ \ | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Youtube video is droppable | François Frisch | 2012-03-17 |
| | | | | | | | | | | | | still getting errors with the carousel | ||
* | | | | Youtube video is droppable | François Frisch | 2012-03-17 |
|/ / / | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Integrating picasa carousel and youtube channel | François Frisch | 2012-03-17 |
| | | | |||
* | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵ | Valerio Virgillito | 2012-03-17 |
| | | | | | | | | | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com> |