aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
|\
| * CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| |
| * Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| |\ | | | | | | Presets - Adding presets controller
| | * Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | |\
| | * | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | | | | | | | | | | | | | | panel code
| * | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ | | |_|/ | |/| | Resizers refactoring
| | * | Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-22
| | |\|
| | * | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\ \ \ | | | | | | | | | | Color Bug Fix
| | * | | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| | | |/ | | |/|
| * | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
| |\ \ \ | | | | | | | | | | I/O Fixes
| | * \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-23
| | |\ \ \ | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically.
| * | | | | Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| | |/ / / | |/| | |
| * | | | Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
| | | | |
| * | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| |/ / / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
| |\ \ \ | | | | | | | | | | | | | | | montage-integration
| | * | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| | | | |
| * | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ | | | |/ / | | |/| | | | | | | montage-integration
| | * | | Presets - Animation updateEric Guzman2012-03-20
| | | | |
| * | | | Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
| |\ \ \ \
| | * | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ | | | |/ / | | |/| | | | | | | montage-integration
| | * | | Maps - Apply default width and height styles to components if specified. ↵Nivesh Rajbhandari2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | looping through both branches of the components treeValerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| | |\ \ | | | | | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset
| | | * | Presets Panel - Fix conflict with default transition presetsEric Guzman2012-03-17
| | | | |
| | | * | Merge branch 'refs/heads/master' into AddAnimationsLibraryEric Guzman2012-03-17
| | | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js
| | | * | Presets Panel - Change Tab labels, Add Un-3d presetEric Guzman2012-03-16
| | | | |
| | * | | Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| | | |/ | | |/| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Youtube video is droppableFrançois Frisch2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| | | |
| * | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Adding components to PIFrançois Frisch2012-03-17
| |/ /
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-19
|\| |
| * | Merge pull request #124 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-16
| |\| | | | | | | Presets Panel - Adding Animations Tab
| | * Presets Panel - Adding Animations TabEric Guzman2012-03-16
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-16
| |\ \
| * | | fixing the components drag and drop.Valerio Virgillito2012-03-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-16
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #121 from dhg637/SomethingValerio Virgillito2012-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 Kesablyan2012-03-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge pull request #118 from mencio/pi-fixesValerio Virgillito2012-03-15
| |\ \ \ | | | | | | | | | | Fixed issues with Properties panel, focus and grid redraw
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:47:10 +0000