aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-14
|\
| * Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\
| | * Merge pull request #34 from ericguzman/TreeComponentsValerio Virgillito2012-02-13
| | |\ | | | | | | | | Tree components - updating the ninja branch/leaf
| | | * Ninja leaf - remove console lotEric Guzman2012-02-13
| | | |
| | | * Merge branch 'refs/heads/master' into TreeComponentsEric Guzman2012-02-13
| | | |\
| | | * | Tree Components - Change the way delegate methods are calledEric Guzman2012-02-13
| | | | |
| * | | | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\| | |
| | * | | Bug FixesJose Antonio Marquez2012-02-13
| | | |/ | | |/| | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
| * | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-02-12
| |\| | | | | | | | | | | | | | stage-color
| * | | initial color chip for the stageValerio Virgillito2012-02-10
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-09
| |\ \ \ | | | | | | | | | | | | | | | feature-branch
| * \ \ \ Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ↵Valerio Virgillito2012-02-09
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feature-branch
| | * | | | Removing the un-used package.jsonValerio Virgillito2012-02-09
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| | |\ \ \ | | | |_|/ | | |/| | Pentool
| | | * | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| | | * \ \ Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-02-02
| | | |\ \ \ \
| | | | * | | | Fixing the bread-crumb backgroundValerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-01-31
| | | |\| | | |
| | | | * | | | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
| | | |/ / / /
| | * | | / / Tree Components - css fixesEric Guzman2012-02-08
| | | |_|/ / | | |/| | |
| | * | | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| | |\ \ \ \ | | | | | | | | | | | | | | Pi bugs fixes for 964, 616, 1084
| | | * | | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
| | | * | | | Added ability to toggle combobox's visibility so we can show/hide materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Updated tools and PI to get/set materials by binding to appModel's materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Add enabled property for ComboBox to support enabling/disabling materials ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Squashed commit of the following:Jonathan Duran2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |