aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into ↵hwc4872012-04-05
|\ | | | | | | Snapping_II
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Snapping Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-03
| |\ \ | | | | | | | | | | | | Snapping
| * | | merge from mainhwc4872012-03-29
| | | |
* | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \ | | | | | | | | | | Bug fixes
| | * \ \ Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\ \ \
| | * | | | Resizing BugsArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js
| | * | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-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>
| | * | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| | |/
| * | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\|
| * | Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
| | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets)
* | | completing the component simple piValerio Virgillito2012-03-30
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
|\ \ \ | | |/ | |/|
| * | 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>
* | | | Cleanup of the components panelValerio Virgillito2012-03-26
|/ / / | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@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