aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #173 from mencio/stage-document-architectureValerio Virgillito2012-04-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the 3d stack for the youtube channel component.Valerio Virgillito2012-04-20
| |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the flow component to layout all the tiles on first draw.Valerio Virgillito2012-04-20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #172 from mayhewinator/WorkingBranchmayhewinator2012-04-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fixed injection caused by inability to add our webRequest listener due to an ...John Mayhew2012-04-20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #170 from mayhewinator/WorkingBranchmayhewinator2012-04-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Removed hack that required us to use a bogus url for host permissions. Chrome...John Mayhew2012-04-19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #169 from mayhewinator/WorkingBranchValerio Virgillito2012-04-19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Updated Manifest.json for the CRX buildJohn Mayhew2012-04-19
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool...Nivesh Rajbhandari2012-04-18
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Snapping_II' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Allow snapping to unselected objectshwc4872012-04-17
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | snapping for stage rotation toolhwc4872012-04-16
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | 3D translation fixeshwc4872012-04-16
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | 3D rotationhwc4872012-04-13
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | 3D Rotate changeshwc4872012-04-13
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Rotate3D tool changeshwc4872012-04-11
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin...hwc4872012-04-05
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | |