aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
|\
| * Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
| |\
| | * Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | * Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | * 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 branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| | |\ \ \ \
| | * | | | | 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
* | | | | | | Style sheet - Style updateEric Guzman2012-04-09
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-05
|\| | | | | |
| * | | | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| * | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | 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
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
| | |_|_|/ / | |/| | | |
* | | | | | Style Sheets - More CSS tweaksEric Guzman2012-04-05
* | | | | | Style Sheets - Style update for edit viewEric Guzman2012-04-05
* | | | | | Rule List - Update selection to not use "_element" property.Eric Guzman2012-04-04
* | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-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
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | 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
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | |_|_|_|/ | |/| | | |
* | | | | | Style sheets section - Edit mode css tweaks and buttonsEric Guzman2012-04-04
* | | | | | CSS Panel - Stylesheet edit modeEric Guzman2012-04-03
* | | | | | 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
| |\| | |
| | * | | 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
| * | | 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
| | |\ \ \