Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
|\ | |||
| * | save integration - minor bug fix | Ananya Sen | 2012-02-13 |
| * | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| |\ | |||
| * | | integrating save functionality | Ananya Sen | 2012-02-13 |
* | | | File IO UI tweaks | Jose Antonio Marquez | 2012-02-13 |
| |/ |/| | |||
* | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-13 |
|\| | |||
| * | new file dialog - preselect default template | Ananya Sen | 2012-02-13 |
| * | added logical drive selection to file picker | Ananya Sen | 2012-02-13 |
| * | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| |\ | |||
| * \ | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-13 |
| |\ \ | |||
* | \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
|\ \ \ \ | |_|_|/ |/| | | | |||
| * | | | Merge pull request #39 from mencio/montage-overrides | Valerio Virgillito | 2012-02-13 |
| |\ \ \ | |||
| | * | | | Adding a montage override sass file. Overriding the default css for montage p... | Valerio Virgillito | 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 |
| * | | | show iframeContainer if all documents are closed | Ananya Sen | 2012-02-10 |
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||
| * | | Merge pull request #38 from ericguzman/StylesControllerUpdates | Valerio Virgillito | 2012-02-13 |
| |\ \ | |||
| | * \ | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-13 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #37 from mencio/stage-color | Valerio Virgillito | 2012-02-13 |
| |\ \ \ | |||
| | * \ \ | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 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 |
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 |
|\| | | | | | | | |||
| * | | | | | | | Merge pull request #36 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-02-13 |
| |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-13 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||
| | * | | | | | | | implemented finalized splash screen | John Mayhew | 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 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Save 'code' view files | Jose Antonio Marquez | 2012-02-13 |
* | | | | | | | | File Save (with CSS styles) | Jose Antonio Marquez | 2012-02-12 |
* | | | | | | | | File Save (HTML only) | Jose Antonio Marquez | 2012-02-12 |
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
|\| | | | | | | | |||
| * | | | | | | | Merge pull request #32 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-10 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-10 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #31 from mqg734/WebGLFixes | Valerio Virgillito | 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 |
| | * | | | | | | | Removing some console logs. I kept in the ones that signify error cases. | Nivesh Rajbhandari | 2012-02-09 |