aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-21
|\ | | | | | | FileIO-Montage-Components
| * Initializing carousel in middle positionFrançois Frisch2012-03-20
| |
| * changing the RSS reader default sized and padding.Valerio Virgillito2012-03-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| |\ | | | | | | | | | FeedReaderAnimation
| | * Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| | |\
| | * | Removing the youtube channel video black backgroundValerio Virgillito2012-03-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Feed Reader - Fix reference closure'd "this"Eric Guzman2012-03-20
| | |/ | |/|
| * | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| |\| | | | | | | | | | FeedReaderAnimation
| | * Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-20
| | |\
| | * | Fixing the selection issuesValerio Virgillito2012-03-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | giving the feed reader a default size when emptyValerio Virgillito2012-03-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Feed Reader - change default display mode to "timer"Eric Guzman2012-03-20
| | | |
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalEric Guzman2012-03-20
| |\ \ \ | | | |/ | | |/|
| | * | Reset the animation event handlers/timer when the display mode changes.Kishore Subramanian2012-03-20
| | |/
| * | Feed Reader - Add PI field for display modeEric Guzman2012-03-20
| | |
| * | Presets - Animation updateEric Guzman2012-03-20
| |/
| * Animation for the Feed readerKishore Subramanian2012-03-20
| |
| * Change Youtube channel transition to avoid rendering bugStuart Knightley2012-03-20
| |
| * 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>
| * Preserve-3d on flow and specify default dimensions on picasa-carousel.Nivesh Rajbhandari2012-03-19
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * 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
| |
| * 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
| |
* | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \
| * \ Merge pull request #129 from mqg734/WebGLMaterialsValerio Virgillito2012-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 Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fixing error in drawUtils when closing document - should set _eltArray and ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| |/ / | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | 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>
* | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-19
|\ \ \ \ | | |_|/ | |/| | | | | | FileIO-Montage-Components
| * | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Tests and clean-upJose Antonio Marquez2012-03-18
| | | |