| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| |\ | |||
| | * | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-19 |
| | |\ | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | Tests and clean-up | Jose Antonio Marquez | 2012-03-18 |
| | | | | |||
| | * | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵ | Jose Antonio Marquez | 2012-03-18 |
| | |\ \ | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | * | | | Temp I/O functionality for M-JS components | Jose Antonio Marquez | 2012-03-18 |
| | | | | | | | | | | | | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional. | ||
| * | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | montage-integration | ||
| | * | | | | Presets Panel - Add Font style preset | Eric Guzman | 2012-03-21 |
| | | | | | | |||
| * | | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 |
| |\ \ \ \ \ | |||
| | * | | | | | Button's enabled property binding should be oneway only. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Support edit material button in oval and line PI. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Use new tree control in Materials panel. | 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-20 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | montage-integration | ||
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Eric Guzman | 2012-03-20 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation | ||
| | * | | | | | | Presets - Animation update | Eric Guzman | 2012-03-20 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | montage-integration | ||
| | * | | | | | | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/button-switch' into montage-integration | Valerio Virgillito | 2012-03-20 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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> | ||
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | montage-integration | ||
| | * | | | | | 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> | ||
| | * | | | | 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 |
| | | | | | |||
| | * | | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | | |/ | |/| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | 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> | ||
| * | | | 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 |
| | | | | |||
| * | | | 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 |
| |\ \ | |||
| | * | | 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> | ||