aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-09
|\
| * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| |\
| | * Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| | |\
| | | * Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| | | |\
| | | * \ Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| | | |\ \
| | | * \ \ Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-01
| | | |\ \ \
| | | * \ \ \ Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into wo...hwc4872012-01-30
| | | |\ \ \ \
| | | * | | | | updated from old repohwc4872012-01-27
| | * | | | | | adding oneway to the 3d bindings to fix a bug where the stage was getting sel...Valerio Virgillito2012-02-09
| * | | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| |\| | | | | |
| | * | | | | | Correcting the PI lock for height which had a bug in the original pull request.Valerio Virgillito2012-02-08
| | * | | | | | Fix for the PI Lock button.Valerio Virgillito2012-02-08
| | | |_|_|_|/ | | |/| | | |
* | / | | | | Removed unused materials.Nivesh Rajbhandari2012-02-09
|/ / / / / /
* / / / / / Fixed radio button to update 3d values when switching from local to global an...Nivesh Rajbhandari2012-02-08
|/ / / / /
* | | | | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
* | | | | Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
| |_|_|/ |/| | |
* | | | We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
* | | | Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
* | | | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
|\ \ \ \
| * | | | Removed border special-casing from PI since the mediator now handles this gen...Nivesh Rajbhandari2012-02-01
| * | | | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | |/ / | |/| |
| * | | IKNINJA-1083Jose Antonio Marquez2012-01-30
* | | | Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
|\ \ \ \
| * \ \ \ Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| |\ \ \ \
| | * | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | * | | | Fixes for montage integrationValerio Virgillito2012-02-01
| * | | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| * | | | | Fixes for montage integrationValerio Virgillito2012-02-02
| * | | | | Merge pull request #12 from mqg734/ToolFixesValerio Virgillito2012-02-02
| |\ \ \ \ \
| * | | | | | Delete unneeded compass log file (IKNINJA 1101).Jon Reid2012-02-01
| | |/ / / / | |/| | | |
| * | | | | IKNINJA-1083Jose Antonio Marquez2012-02-01
| | |/ / / | |/| | |
| * | | | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| | |/ / | |/| |
* | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| |/ / |/| |
* | | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ...Nivesh Rajbhandari2012-02-02
| |/ |/|
* | Fixing 3d section of the PI.Nivesh Rajbhandari2012-01-31
* | Support stage in PI's 3d section.Nivesh Rajbhandari2012-01-31
* | Merging Jose's colorchip change.Nivesh Rajbhandari2012-01-31
* | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27