aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-14
|\
| * Fixing the live preview background issue.Valerio Virgillito2012-02-14
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-14
| |\
| * | Implemented about box component and hooked it up to the About menuJohn Mayhew2012-02-14
* | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-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
| | |\|
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-10
| | | |\
| | | | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| | | | |\
| | | | * | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | | | * | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-10
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into ...Valerio Virgillito2012-02-09
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Squashed commit of the following:Jonathan Duran2012-02-08
| | | | | * Squashed commit of the following:Jonathan Duran2012-02-08
| | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tim...Jonathan Duran2012-02-06
| | | | | |\
| | | | | * | style controller update for CSS animationsJonathan Duran2012-02-06
| | | * | | | -Changed the capitalization of all main top level menus from all capsJohn Mayhew2012-02-10
| | * | | | | initial color chip for the stageValerio Virgillito2012-02-10
| | | |/ / / | | |/| | |
| * | | | | Styles Controller - Separate css animation rule gettersEric Guzman2012-02-13
| * | | | | Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-08
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Styles Controller - added methods to get keyframe animation rulesEric Guzman2012-02-08
* | | | | | Setting defaults and more cleanupValerio Virgillito2012-02-09
* | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-09
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fixed several typos in Materials import/export code to support toggling betwe...Nivesh Rajbhandari2012-02-08
* | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-08
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | / Styles Controller - Added array of dirty stylesheets and event dispatch when ...Eric Guzman2012-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
| * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh 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 'master' into componentsValerio Virgillito2012-02-06
|\ \ \ | | |/ | |/|
| * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| * | Tree Controller - Initial addEric Guzman2012-02-06
| * | Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| * | Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| * | Styles Controller - Add code to remove cache items from history (not just nul...Eric Guzman2012-02-06
| * | Styles Controller - First stab at group stylingEric Guzman2012-02-06
| |/
* | Merge branch 'master' into componentsValerio Virgillito2012-02-06
|\ \
| * \ Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| |\ \ | | |/ | |/|
| | * Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | * Tree Controller - Initial addEric Guzman2012-02-06