aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\
| * changing the RSS reader default sized and padding.Valerio Virgillito2012-03-20
* | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\|
| * Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-20
| |\
| * | Feed Reader - Fix reference closure'd "this"Eric Guzman2012-03-20
* | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| |\|
| | * Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-20
| | |\
| | * | 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
| | |_|/ | |/| |
* | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\| | |
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| |\ \ \ | | | |/ | | |/|
| | * | Reset the animation event handlers/timer when the display mode changes.Kishore Subramanian2012-03-20
| | |/
| * | Fixing the selection issuesValerio Virgillito2012-03-20
| * | giving the feed reader a default size when emptyValerio Virgillito2012-03-20
| |/
| * Animation for the Feed readerKishore Subramanian2012-03-20
| * Change Youtube channel transition to avoid rendering bugStuart Knightley2012-03-20
* | Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
|\ \
| * | fully removing our old button component from NinjaValerio Virgillito2012-03-19
* | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\ \ \ | | |/ | |/|
| * | 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
* | | 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