aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\
| * Preserve-3d on flow and specify default dimensions on picasa-carousel.Nivesh Rajbhandari2012-03-19
* | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\|
| * fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| * Update Youtube channel to have three thumbnailsStuart Knightley2012-03-19
* | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\|
| * Map - width and height should be 100% so resize handles work.Nivesh Rajbhandari2012-03-19
| * "Category" property should use "select" control.Nivesh Rajbhandari2012-03-19
| * Maps - Apply default width and height styles to components if specified. Chan...Nivesh Rajbhandari2012-03-19
| * Changes to Map and FeedReaderKishore Subramanian2012-03-19
| * Changes to the DemoKishore Subramanian2012-03-19
| * 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
| * looping through both branches of the components treeValerio Virgillito2012-03-18
* | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
|\ \ | |/ |/|
| * Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| |\
| | * Presets Panel - Fix conflict with default transition presetsEric Guzman2012-03-17
| | * Merge branch 'refs/heads/master' into AddAnimationsLibraryEric Guzman2012-03-17
| | |\
| | * | 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.Nivesh Rajbhandari2012-03-19
| |/ /
* | | changing the picasa-carousel to use a getter and setter for the queryParameterValerio Virgillito2012-03-18
* | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-17
|\ \ \
| * | | Youtube video is droppableFrançois Frisch2012-03-17
* | | | Youtube video is droppableFrançois Frisch2012-03-17
|/ / /
* | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
* | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to "z...Valerio Virgillito2012-03-17
* | | 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
* | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
* | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
* | | 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 TabEric Guzman2012-03-16
* | Squashed commit of SnapManagerFixesValerio Virgillito2012-03-16
* | 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 existenceAnanya Sen2012-03-16
| |/ /
| * | Merge pull request #121 from dhg637/SomethingValerio Virgillito2012-03-16
| |\ \
| | * | Presets Panel: Added Scale Up and Down to transitions list. According to eric G.Armen Kesablyan2012-03-15
* | | | fixing the components drag and drop.Valerio Virgillito2012-03-16
|/ / /
* | | fixing the drag and drop images to the pasteboardValerio Virgillito2012-03-16
* | | Temp fix applied to all elementsJose Antonio Marquez2012-03-15
* | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
|\ \ \