aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\
| * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| |\
| * | Fixing eyedropper tool to get color from image data. This required us to work...Nivesh Rajbhandari2012-02-22
* | | Do not use color object for stage's border since we don't allow users to modi...Nivesh Rajbhandari2012-02-22
* | | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\ \ \ | |/ / |/| / | |/
| * enabling nested selectionValerio Virgillito2012-02-20
* | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
|\|
| * Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| |\
| | * Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
| |\|
| | * Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-14
| | |\
| | * \ Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio Virgillito2012-02-14
| | |\ \
| | * \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Updated canvas controller to override setProperties so we don't set styles wh...Nivesh Rajbhandari2012-01-29
| | * | | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
| * | | | | | | | | | Adding more components piValerio Virgillito2012-02-15
| * | | | | | | | | | fixing the controller to handle all propertiesValerio Virgillito2012-02-14
| * | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Setting defaults and more cleanupValerio Virgillito2012-02-09
| * | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-08
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into componentsValerio Virgillito2012-02-06
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | button component using json dataValerio Virgillito2012-02-03
| * | | | | | | | | Merge branch 'master' into componentsValerio Virgillito2012-02-03
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Simple button native widget test. Added a controller, pi and panel code.Valerio Virgillito2012-02-01
* | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Fixing the live preview background issue.Valerio Virgillito2012-02-14
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
|\| | | | | | | |
| * | | | | | | | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into sta...Valerio Virgillito2012-02-12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | initial color chip for the stageValerio Virgillito2012-02-10
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
* | | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
| |/ / / / / / |/| | | | | |
* | | | | | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
* | | | | | | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
|/ / / / / /
* | | | / / Fixed several typos in Materials import/export code to support toggling betwe...Nivesh Rajbhandari2012-02-08
| |_|_|/ / |/| | | |
* | | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
* | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ma...Nivesh Rajbhandari2012-02-07
* | | | | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
* | | | | Force layout canvas and SelectionController to update their info when a 2d ca...Nivesh Rajbhandari2012-02-06
* | | | | Support toggling between 2d and 3d canvas context. This requires us to create...Nivesh Rajbhandari2012-02-06
* | | | | Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
* | | | | Allow users to switch between 2d and webGL mode. Note that this doesn't curre...Nivesh Rajbhandari2012-02-06