Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | Fix: IKNINJA-1362 | Jose Antonio Marquez | 2012-03-26 | |
| | | |/ / / / | | |/| | | | | ||||
| * | | | | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | I/O Fixes | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-23 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | |||
| | * | | | | | | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically. | |||
| * | | | | | | | | Presets - fixed preset group name ("2D") | Eric Guzman | 2012-03-23 | |
| | |/ / / / / / | |/| | | | | | | ||||
| * | | | | | | | Presets Panel - Add slide/fade out animation | Eric Guzman | 2012-03-23 | |
| | | | | | | | | ||||
| * | | | | | | | Adding enabled/disabled support for PI's checkbox control. | Nivesh Rajbhandari | 2012-03-22 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | 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 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> | |||
| | * | | | | | | 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 | |||
| | * | | | | | | Presets - Animation update | Eric Guzman | 2012-03-20 | |
| | | | | | | | | ||||
| * | | | | | | | 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 | |||
| | * | | | | | | 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> | |||
| | * | | | | | | 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 element creation for the map and feedreader components. | Valerio Virgillito | 2012-03-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | Adding components to PI | François Frisch | 2012-03-17 | |
| |/ / / / / | ||||
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-19 | |
|\| | | | | | ||||
| * | | | | | 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 | |
| | | | | | | ||||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-16 | |
| |\ \ \ \ \ | ||||
| * | | | | | | fixing the components drag and drop. | Valerio Virgillito | 2012-03-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-16 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| * | | | | | | 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> | |||
| * | | | | | | Merge pull request #118 from mencio/pi-fixes | Valerio Virgillito | 2012-03-15 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Fixed issues with Properties panel, focus and grid redraw | |||
| | * | | | | | Merge branch 'refs/heads/master' into pi-fixes | Valerio Virgillito | 2012-03-15 | |
| | |\| | | | | ||||
| | * | | | | | Fixing the splitter resize canvas bug by getting the size when a document is ↵ | Valerio Virgillito | 2012-03-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | adding a focus manager to handle panel bugs where blur was not getting ↵ | Valerio Virgillito | 2012-03-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵ | Valerio Virgillito | 2012-03-14 | |
| | | | | | | | |< |