aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
...
* | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #34 from ericguzman/TreeComponentsValerio Virgillito2012-02-13
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 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/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\| | | | |
| * | | | | Bug FixesJose Antonio Marquez2012-02-13
| | |/ / / | |/| | |
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\| | | |
| * | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea...Valerio Virgillito2012-02-09
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | More Text Tool UpdatesArmen Kesablyan2012-02-09
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into tex...Armen Kesablyan2012-02-07
| | |\ \ \
| | * | | | Refactored rich text editor locationArmen Kesablyan2012-02-07
| | * | | | Initial Text tool completion.Armen Kesablyan2012-02-07
| * | | | | Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ...Valerio Virgillito2012-02-09
| |\ \ \ \ \
| | * | | | | Removing the un-used package.jsonValerio Virgillito2012-02-09
| | | |_|_|/ | | |/| | |
| * | | | | Squashed commit of the following:Jonathan Duran2012-02-09
| * | | | | Squashed commit of the following:Jonathan Duran2012-02-08
| * | | | | 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
| |\ \ \ \ \
| * | | | | | Integrate breadcrumb component and layer handling codeJonathan Duran2012-02-06
| * | | | | | merge new timelineJonathan Duran2012-02-06
* | | | | | | file open and file new integrated againAnanya Sen2012-02-10
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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 'master' into pentoolPushkar Joshi2012-02-02
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-01-31
| | |\ \ \ \ \ \ \
| | * | | | | | | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | fixed templates descriptor, changed validation to on key up, fixed minor ui i...Ananya Sen2012-02-09
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| | | | | | | |
| * | | | | | | | Tree Components - css fixesEric Guzman2012-02-08
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-08
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\| | | | | | |
| | * | | | | | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| | |\ \ \ \ \ \ \
| | | * | | | | | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Added ability to toggle combobox's visibility so we can show/hide materials c...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
| | | * | | | | | Updated tools and PI to get/set materials by binding to appModel's materials ...Nivesh Rajbhandari2012-02-07
| | | * | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
| | | | |_|_|_|/ | | | |/| | | |
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
| |\| | | | | |
| | * | | | | | Tree Components - Added copyright commentsEric Guzman2012-02-07
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\| | | | |
| | * | | | | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | * | | | | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | |/ / / /
| * | | | | Adding logic to copy ninja librariesJose Antonio Marquez2012-02-06