Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into sta... | Valerio Virgillito | 2012-02-12 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||
| * | | | | | initial color chip for the stage | Valerio Virgillito | 2012-02-10 | |
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||
| * | | | | | Merge pull request #34 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-13 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||
| | * | | | | Ninja leaf - remove console lot | Eric Guzman | 2012-02-13 | |
| | * | | | | Merge branch 'refs/heads/master' into TreeComponents | Eric Guzman | 2012-02-13 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||
| | * | | | | Tree Components - Change the way delegate methods are called | Eric Guzman | 2012-02-13 | |
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
|\| | | | | | ||||
| * | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-13 | |
| | |/ / / | |/| | | | ||||
* | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 | |
|\| | | | | ||||
| * | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea... | Valerio Virgillito | 2012-02-09 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | * | | | More Text Tool Updates | Armen Kesablyan | 2012-02-09 | |
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into tex... | Armen Kesablyan | 2012-02-07 | |
| | |\ \ \ | ||||
| | * | | | | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 | |
| | * | | | | Initial Text tool completion. | Armen Kesablyan | 2012-02-07 | |
| * | | | | | Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ... | Valerio Virgillito | 2012-02-09 | |
| |\ \ \ \ \ | ||||
| | * | | | | | Removing the un-used package.json | Valerio Virgillito | 2012-02-09 | |
| | | |_|_|/ | | |/| | | | ||||
| * | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-09 | |
| * | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| * | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| * | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-08 | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tim... | Jonathan Duran | 2012-02-06 | |
| |\ \ \ \ \ | ||||
| * | | | | | | Integrate breadcrumb component and layer handling code | Jonathan Duran | 2012-02-06 | |
| * | | | | | | merge new timeline | Jonathan Duran | 2012-02-06 | |
* | | | | | | | file open and file new integrated again | Ananya Sen | 2012-02-10 | |
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| * | | | | | | Merge pull request #26 from pushkarjoshi/pentool | Valerio Virgillito | 2012-02-09 | |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||
| | * | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-08 | |
| | |\ \ \ \ \ | ||||
| | * \ \ \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-07 | |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | ||||
| | * | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-02 | |
| | |\ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-01-31 | |
| | |\ \ \ \ \ \ \ | ||||
| | * | | | | | | | | missed a couple of pen tool property files on last checkin | Pushkar Joshi | 2012-01-30 | |
| | | |_|_|_|_|/ / | | |/| | | | | | | ||||
* | | | | | | | | | fixed templates descriptor, changed validation to on key up, fixed minor ui i... | Ananya Sen | 2012-02-09 | |
* | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
|\| | | | | | | | | ||||
| * | | | | | | | | Tree Components - css fixes | Eric Guzman | 2012-02-08 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-08 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
| |\| | | | | | | | ||||
| | * | | | | | | | Merge pull request #21 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 | |
| | |\ \ \ \ \ \ \ | ||||
| | | * | | | | | | | IKNINJA - 1084: Fixing the custom tag. | Valerio Virgillito | 2012-02-07 | |
| | | | |_|_|_|_|/ | | | |/| | | | | | ||||
| | * | | | | | | | Merge pull request #20 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-08 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||
| | | * | | | | | | Added ability to toggle combobox's visibility so we can show/hide materials c... | Nivesh Rajbhandari | 2012-02-07 | |
| | | * | | | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ma... | Nivesh Rajbhandari | 2012-02-07 | |
| | | * | | | | | | Fixed PI to support WebGL materials. | Nivesh Rajbhandari | 2012-02-07 | |
| | | * | | | | | | Updated tools and PI to get/set materials by binding to appModel's materials ... | Nivesh Rajbhandari | 2012-02-07 | |
| | | * | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-07 | |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | ||||
| | | * | | | | | | Add enabled property for ComboBox to support enabling/disabling materials dro... | Nivesh Rajbhandari | 2012-02-06 | |
| | | | |_|_|_|/ | | | |/| | | | | ||||
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-07 | |
| |\| | | | | | | ||||
| | * | | | | | | Tree Components - Added copyright comments | Eric Guzman | 2012-02-07 | |
| | | |/ / / / | | |/| | | | | ||||
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| |\| | | | | | ||||
| | * | | | | | TreeController - moving the tree controller to the components directory | Eric Guzman | 2012-02-06 |