| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 | |
| | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 | |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js | |||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 | |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||
| | * | | | | | | Presets - Remove style transition when transition doesn't start. Also added ↵ | Eric Guzman | 2012-03-29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets) | |||
| * | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| | * | | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 | |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | Style sheets section - Edit mode css tweaks and buttons | Eric Guzman | 2012-04-04 | |
| | | | | | | | ||||
| * | | | | | | CSS Panel - Stylesheet edit mode | Eric Guzman | 2012-04-03 | |
| | | | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 | |
| |\| | | | | | ||||
| | * | | | | | CSS Panel - Fix animation duration value updates from "infinite" to integer. | Eric Guzman | 2012-03-29 | |
| | | |/ / / | |/| | | | ||||
| | * | | | | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 | |
| | |\| | | | | | | | | | | | | | Presets - Adding presets controller | |||
| | | * | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 | |
| | | |\| | | ||||
| | | * | | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 | |
| | | | |/ | | |/| | | | | | | | | | panel code | |||
| | * | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 | |
| | |\ \ \ | | |_|/ | |/| | | Resizers refactoring | |||
| | | * | | Resizers updated | Armen Kesablyan | 2012-03-23 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | | * | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-22 | |
| | | |\| | ||||
| | | * | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 | |
| | |\ \ \ | | | | | | | | | | | Color Bug Fix | |||
| | | * | | | 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 | |
| |\| | | ||||