| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | | | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | | | ||||
| | * | | | | | | | 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 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | ||||
| | * | | | | | 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 | |
| | | |_|/ / | |/| | | | ||||
| * | | | | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | WebGL needs to have 3d styles to render. | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | IKNinja-1368 - Moving multiple selection of 2d elements starts changing the ↵ | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | objects' relative positions. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | IKNINJA-758 - The rotation value of the stage is not updated in the ↵ | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | Translation handles do not redraw at correct location when double-clicking ↵ | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to reset. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-22 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | ||||
| | * | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-21 | |
| | |\ \ \ \ | | |_|_|/ | |/| | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ... | |||
| | | * | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵ | Ananya Sen | 2012-03-16 | |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | Do not set webkit-transform styles on elements unless 3d is used on them. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | Get matrix and perspective distance from styles controller. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | We should draw tag outlines only for nodeType = 1. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI. | Nivesh Rajbhandari | 2012-03-20 | |
| |/ / / | | | | | | | | | | | | | | | | This bug was injected by some changes in GLWorld.import. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | 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 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 | |||