aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
|\
| * fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
|\ \ | | | | | | | | | montage-integration
| * | Reformating carouselFrançois Frisch2012-03-19
| | |
| * | Update manifest to remove youtubeStuart Knightley2012-03-19
| | |
| * | Need to allow youtube.com content in Ninja's manifest. Note you will have to ↵Nivesh Rajbhandari2012-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 Virgillito2012-03-19
|\| | | | | | | | | | | montage-integration
| * | Preserve-3d on flow and specify default dimensions on picasa-carousel.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-19
|\| | | | | | | | | | | montage-integration
| * | fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Update Youtube channel to have three thumbnailsStuart Knightley2012-03-19
| | |
* | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
|\| | | | | | | | | | | montage-integration
| * | Map - width and height should be 100% so resize handles work.Nivesh Rajbhandari2012-03-19
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | "Category" property should use "select" control.Nivesh Rajbhandari2012-03-19
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Maps - Apply default width and height styles to components if specified. ↵Nivesh Rajbhandari2012-03-19
| | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Changes to Map and FeedReaderKishore Subramanian2012-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 DemoKishore Subramanian2012-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 HTML5Stuart Knightley2012-03-19
| | |
| * | Youtube appending script in drawFrançois Frisch2012-03-19
| | |
| * | using channel name rather than urlFrançois Frisch2012-03-18
| | |
| * | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | looping through both branches of the components treeValerio Virgillito2012-03-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| |\ | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset
| | * Presets Panel - Fix conflict with default transition presetsEric Guzman2012-03-17
| | |
| | * Merge branch 'refs/heads/master' into AddAnimationsLibraryEric Guzman2012-03-17
| | |\ | | | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js
| | * | Presets Panel - Change Tab labels, Add Un-3d presetEric Guzman2012-03-16
| | | |
| * | | Merge pull request #128 from mqg734/WebGLMaterialsValerio Virgillito2012-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 Rajbhandari2012-03-19
| |/ / | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | changing the picasa-carousel to use a getter and setter for the queryParameterValerio Virgillito2012-03-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-17
|\ \ \ | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Youtube video is droppableFrançois Frisch2012-03-17
| | | | | | | | | | | | still getting errors with the carousel
* | | | Youtube video is droppableFrançois Frisch2012-03-17
|/ / / | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| | |
* | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵Valerio Virgillito2012-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>
* | | Adding the youtube playerFrançois Frisch2012-03-17
| | |
* | | Added a new picasa-carousel component as well as an example using itBenoit Marchant2012-03-17
| | |
* | | fixing the map styles and temporary disabling the 3d styles for elements.Valerio Virgillito2012-03-17
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Adding components to PIFrançois Frisch2012-03-17
| | |
* | | Deleting unecessary propertyFrançois Frisch2012-03-17
| | |
* | | Adding feed reader and mapFrançois Frisch2012-03-17
| | |
* | | Getting ownerComponent bindingsFrançois Frisch2012-03-17
|/ /
* | Merge pull request #124 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-16
|\| | | | | Presets Panel - Adding Animations Tab
| * Presets Panel - Adding Animations TabEric Guzman2012-03-16
| |
* | Squashed commit of SnapManagerFixesValerio Virgillito2012-03-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-16
|\ \
| * \ Merge pull request #122 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-16
| |\ \ | | | | | | | | IKNINJA-1305 : fixed the check for stopVideos() method's existence
| | * | IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| |/ / | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>