aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
|\
| * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| |\
| * \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| |\ \
| * | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
* | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ...Valerio Virgillito2012-04-26
|\ \ \ \ | |_|_|/ |/| | |
| * | | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| | |/ | |/|
* | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
|\ \ \ | |/ / |/| |
| * | We don't currently support perspective values on individual elements, so remo...Nivesh Rajbhandari2012-04-26
| |/
* | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
|\|
| * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\
| | * cleanup unused code.Valerio Virgillito2012-04-19
| * | 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
| |/
| * 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
| |/
* / Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
|/
* 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
* | | | | | 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
| |\| | |