aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\
| | * Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | |\
| | | * merge from mainhwc4872012-03-29
| * | | Styling PI's Materials edit button.Nivesh Rajbhandari2012-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
| |\|
| | * Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| | |\
| | * \ 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
| * | | | | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
| | |_|_|/ | |/| | |
| * | | | 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 branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| * | | | Youtube video is droppableFrançois Frisch2012-03-17
| * | | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| * | | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| * | | | Adding components to PIFrançois Frisch2012-03-17
| | |_|/ | |/| |
* | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
* | | | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
* | | | IKNINJA-758 - The rotation value of the stage is not updated in the propertie...Nivesh Rajbhandari2012-03-22
| |_|/ |/| |
* | | Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20