| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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> | ||
| * | | | Adding the youtube player | François Frisch | 2012-03-17 |
| | | | | |||
| * | | | Added a new picasa-carousel component as well as an example using it | Benoit Marchant | 2012-03-17 |
| | | | | |||
| * | | | fixing the map styles and temporary disabling the 3d styles for elements. | Valerio Virgillito | 2012-03-17 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | adding element creation for the map and feedreader components. | Valerio Virgillito | 2012-03-17 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Fixed snap-manager to stop snapping after first level children. | Nivesh Rajbhandari | 2012-03-17 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Adding components to PI | François Frisch | 2012-03-17 |
| | | | | |||
| * | | | Deleting unecessary property | François Frisch | 2012-03-17 |
| | | | | |||
| * | | | Adding feed reader and map | François Frisch | 2012-03-17 |
| | | | | |||
| * | | | Getting ownerComponent bindings | François Frisch | 2012-03-17 |
| |/ / | |||
| * | | Merge pull request #124 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-16 |
| |\| | | | | | Presets Panel - Adding Animations Tab | ||
| | * | Presets Panel - Adding Animations Tab | Eric Guzman | 2012-03-16 |
| | | | |||
| * | | Squashed commit of SnapManagerFixes | Valerio Virgillito | 2012-03-16 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-16 |
| |\ \ | |||
| | * \ | Merge pull request #122 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-16 |
| | |\ \ | | | | | | | | | IKNINJA-1305 : fixed the check for stopVideos() method's existence | ||
| | | * | | IKNINJA-1305 : fixed the check for stopVideos() method's existence | Ananya Sen | 2012-03-16 |
| | |/ / | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | Merge pull request #121 from dhg637/Something | Valerio Virgillito | 2012-03-16 |
| | |\ \ | | | | | | | | | Presets Panel: Added Scale Up and Down to transitions list. According to | ||
| | | * | | Presets Panel: Added Scale Up and Down to transitions list. According to eric G. | Armen Kesablyan | 2012-03-15 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | fixing the components drag and drop. | Valerio Virgillito | 2012-03-16 |
| |/ / / | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | fixing the drag and drop images to the pasteboard | Valerio Virgillito | 2012-03-16 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Temp fix applied to all elements | Jose Antonio Marquez | 2012-03-15 |
| | | | | | | | | | | | | | This should be moved to 'makeNJElement' to account for the element to be loaded. | ||
| * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 |
| |\ \ \ | |||