aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
|\
| * 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
| |\|
| * | 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/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-14
| |\ \ \ | | | |/ | | |/|
| | * | Fixing the live preview background issue.Valerio Virgillito2012-02-14
| * | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio 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/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | 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
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | 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
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-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
| * | | | | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| | |_|/ / | |/| | |
| * | | | 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
* | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-02
|\| | | | | |/ / / |/| | |
| * | | Integrating Pan and Zoom tool and snap manager fixes.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
| * | | Fixed issue with elements not drawing in the correct plane.Nivesh Rajbhandari2012-01-30
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 15:41:57 +0000