aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin...hwc4872012-04-05
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-04
| |\
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-03
| |\ \
| * | | merge from mainhwc4872012-03-29
* | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
* | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \
| | * \ \ Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\ \ \
| | * | | | Resizing BugsArmen Kesablyan2012-03-29
| | * | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | |/ / | | |/| |
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | |/ | | |/|
| | * | 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 t...Eric Guzman2012-03-29
* | | completing the component simple piValerio Virgillito2012-03-30
* | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
* | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
|\ \ \ | | |/ | |/|
| * | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| |\|
| | * Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | |\
| | * | Presets Panel - Adding presets controller and removing functionality from pan...Eric Guzman2012-03-22
| * | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ | | |_|/ | |/| |
| | * | Resizers updatedArmen Kesablyan2012-03-23
| | * | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-22
| | |\|
| | * | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
* | | | Cleanup of the components panelValerio Virgillito2012-03-26
|/ / /
* | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
|\ \ \
| * | | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| | |/ | |/|
* | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
|\ \ \
| * \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-23
| |\ \ \
| * | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
* | | | | 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
|/ / /
* | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-21
|\ \ \
| * | | 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
| * | | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| * | | Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
| * | | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
* | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | |/ / | |/| |
* | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
|\ \ \ \ | | |/ / | |/| |
| * | | Maps - Apply default width and height styles to components if specified. Chan...Nivesh Rajbhandari2012-03-19
| * | | looping through both branches of the components treeValerio Virgillito2012-03-18
* | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| |\ \