aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
|\
| * Merge pull request #174 from pushkarjoshi/pentoolValerio Virgillito2012-04-24
| |\
| | * Merge branch 'master' into pentoolPushkar Joshi2012-04-24
| | |\ | | |/ | |/|
| * | 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
| |\| | |
| * | | | cleanup unused code.Valerio Virgillito2012-04-19
| | | * | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | * | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | * | more backup fixes for the old stageValerio Virgillito2012-04-20
| | | * | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | * | Merge branch 'refs/heads/Document' into stage-document-architectureValerio Virgillito2012-04-19
| | | |\ \
| | | | * \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-16
| | | | |\ \
| | | | * \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-11
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-10
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Backup for mergeJose Antonio Marquez2012-04-04
| | | | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-02
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Setting up document reworkJose Antonio Marquez2012-04-02
| | | | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-28
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-27
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-26
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-21
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | typo fixValerio Virgillito2012-04-19
| | | * | | | | | | | | | | | | | | | initial stage web templateValerio Virgillito2012-04-18
| | | | | | | | | | | | | | | | | | * re-compute and store the center of the subpath in local coordinates upon file...Pushkar Joshi2012-04-24
| | | | | | | | | | | | | | | | | | * allow the addition of the pen tool to the timelinePushkar Joshi2012-04-23
| | | | | | | | | | | | | | | | | | * Merge branch 'master' into pentoolPushkar Joshi2012-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 01:25:23 +0000