aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
|\
| * save integration - minor bug fixAnanya Sen2012-02-13
| * Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| |\
| * | integrating save functionalityAnanya Sen2012-02-13
* | | File IO UI tweaksJose Antonio Marquez2012-02-13
| |/ |/|
* | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
|\|
| * new file dialog - preselect default templateAnanya Sen2012-02-13
| * added logical drive selection to file pickerAnanya Sen2012-02-13
| * Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| |\
| * \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-13
| |\ \
* | \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge pull request #39 from mencio/montage-overridesValerio Virgillito2012-02-13
| |\ \ \
| | * | | Adding a montage override sass file. Overriding the default css for montage p...Valerio Virgillito2012-02-13
| |/ / /
* | | | Fixing multiple tabsJose Antonio Marquez2012-02-13
* | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ | | |/ / | |/| |
| * | | Revert "Merge from /joseeight/ninja-internal/tree/FileIO"Ananya Sen2012-02-10
| * | | Merge from /joseeight/ninja-internal/tree/FileIOAnanya Sen2012-02-10
| * | | show iframeContainer if all documents are closedAnanya Sen2012-02-10
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge pull request #38 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-13
| |\ \
| | * \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-13
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #37 from mencio/stage-colorValerio Virgillito2012-02-13
| |\ \ \
| | * \ \ Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-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
| | |\ \ \ \
| | * | | | | 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
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\| | | | | | |
| * | | | | | | Merge pull request #36 from mayhewinator/WorkingBranchValerio Virgillito2012-02-13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-13
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | implemented finalized splash screenJohn Mayhew2012-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
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Save 'code' view filesJose Antonio Marquez2012-02-13
* | | | | | | | File Save (with CSS styles)Jose Antonio Marquez2012-02-12
* | | | | | | | File Save (HTML only)Jose Antonio Marquez2012-02-12
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\| | | | | | |
| * | | | | | | Merge pull request #32 from mayhewinator/WorkingBranchmayhewinator2012-02-10
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-10
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #31 from mqg734/WebGLFixesValerio Virgillito2012-02-10
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | * | | | | | | Removing some console logs. I kept in the ones that signify error cases.Nivesh Rajbhandari2012-02-09