aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| * | | | | | | | | | | | | | more backup fixes for the old stageValerio Virgillito2012-04-20
| * | | | | | | | | | | | | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| * | | | | | | | | | | | | | initial stage web templateValerio Virgillito2012-04-18
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | CSSPanel - Add to panel containerEric Guzman2012-04-23
* | | | | | | | | | | | | | CSSPanel - ResizerEric Guzman2012-04-23
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | cleanup unused code.Valerio Virgillito2012-04-19
| |/ / / / / / / / / / / /
| * | | | | | | | | | | / Squashed commit of the following:Valerio Virgillito2012-04-18
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | collapsing the history panel by default and commenting out the undo for the 3...Valerio Virgillito2012-04-13
| * | | | | | | | | | | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| * | | | | | | | | | | adding a history panelValerio Virgillito2012-04-09
| |/ / / / / / / / / /
* | | | | | | | | | | CSS Panel - Add styles view delegate. Add handling for adding rules to styles...Eric Guzman2012-04-23
* | | | | | | | | | | CSS Panel - Add editing and adding new styles in declaration and styleEric Guzman2012-04-23
* | | | | | | | | | | CSS Panel - Add stub for resizerEric Guzman2012-04-23
* | | | | | | | | | | CSS Panel - Add drag and drop UIEric Guzman2012-04-13
* | | | | | | | | | | CSS Style Rule - Show appropriate "sheet name" for inline styleEric Guzman2012-04-13
* | | | | | | | | | | CSS Rule List - Add inline style to supported rule typesEric Guzman2012-04-13
* | | | | | | | | | | CSS Rule List - Add inline style to rule listEric Guzman2012-04-13
* | | | | | | | | | | CSS Style Rule - Make selector editableEric Guzman2012-04-12
* | | | | | | | | | | CSS Style - Make draggableEric Guzman2012-04-12
* | | | | | | | | | | CSS Style - Add disabled UI state. Added Hintable and editable UI state.Eric Guzman2012-04-11
* | | | | | | | | | | CSS Rule List - Enabled list switching on selectionEric Guzman2012-04-11
* | | | | | | | | | | 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