Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in... | Valerio Virgillito | 2012-02-14 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | * | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-13 | |
| | |\ \ \ | ||||
| | * | | | | Setting defaults and more cleanup | Valerio Virgillito | 2012-02-09 | |
| | * | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-09 | |
| | |\ \ \ \ | ||||
| | * \ \ \ \ | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-08 | |
| | |\ \ \ \ \ | ||||
| | * \ \ \ \ \ | Merge branch 'master' into components | Valerio Virgillito | 2012-02-06 | |
| | |\ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into components | Valerio Virgillito | 2012-02-06 | |
| | |\ \ \ \ \ \ \ | ||||
| | * | | | | | | | | button component using json data | Valerio Virgillito | 2012-02-03 | |
| | * | | | | | | | | Merge branch 'master' into components | Valerio Virgillito | 2012-02-03 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | Simple button native widget test. Added a controller, pi and panel code. | Valerio Virgillito | 2012-02-01 | |
| * | | | | | | | | | | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int... | Valerio Virgillito | 2012-02-14 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||
| | * | | | | | | | | save integration - minor bug fix | Ananya Sen | 2012-02-13 | |
| | * | | | | | | | | integrating save functionality | Ananya Sen | 2012-02-13 | |
| | * | | | | | | | | added logical drive selection to file picker | Ananya Sen | 2012-02-13 | |
| | * | | | | | | | | Fixing multiple tabs | Jose Antonio Marquez | 2012-02-13 | |
| | * | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | Revert "Merge from /joseeight/ninja-internal/tree/FileIO" | Ananya Sen | 2012-02-10 | |
| | | * | | | | | | | | Merge from /joseeight/ninja-internal/tree/FileIO | Ananya Sen | 2012-02-10 | |
| | * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||
| | * | | | | | | | | | Save 'code' view files | Jose Antonio Marquez | 2012-02-13 | |
| | * | | | | | | | | | File Save (HTML only) | Jose Antonio Marquez | 2012-02-12 | |
| | * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | Cleaning up open file in code view | Jose Antonio Marquez | 2012-02-10 | |
| | * | | | | | | | | | | Adding back file open for code view | Jose Antonio Marquez | 2012-02-10 | |
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | File Open | Jose Antonio Marquez | 2012-02-10 | |
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||
| | | * | | | | | | | | | Merge pull request #16 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-06 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | Tree Controller - Clean out unused code | Eric Guzman | 2012-02-06 | |
| | | | * | | | | | | | | | Tree Controller - Initial add | Eric Guzman | 2012-02-06 | |
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| | |\| | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Updated canvas controller to override setProperties so we don't set styles wh... | Nivesh Rajbhandari | 2012-01-29 | |
| | * | | | | | | | | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-13 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | Cleaning up the stage background color chip. | Valerio Virgillito | 2012-02-13 | |
| | | * | | | | | | | | | | 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 | |
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Styles Controller - Separate css animation rule getters | Eric Guzman | 2012-02-13 | |
| | * | | | | | | | | | | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-08 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Styles Controller - added methods to get keyframe animation rules | Eric Guzman | 2012-02-08 | |
| * | | | | | | | | | | | Implemented about box component and hooked it up to the About menu | John Mayhew | 2012-02-14 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||
* | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 | |
|\| | | | | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-10 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-10 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Support export/import of GLLine data. | Nivesh Rajbhandari | 2012-02-10 |