Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #174 from pushkarjoshi/pentool | Valerio Virgillito | 2012-04-24 |
|\ | |||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 |
| |\ | |/ |/| | |||
* | | Merge pull request #173 from mencio/stage-document-architecture | Valerio Virgillito | 2012-04-23 |
|\ \ | |||
| * \ | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 |
| |\ \ | |/ / |/| | | |||
* | | | Fixing the 3d stack for the youtube channel component. | Valerio Virgillito | 2012-04-20 |
* | | | Fixing the flow component to layout all the tiles on first draw. | Valerio Virgillito | 2012-04-20 |
* | | | Merge pull request #172 from mayhewinator/WorkingBranch | mayhewinator | 2012-04-20 |
|\ \ \ | |||
| * | | | fixed injection caused by inability to add our webRequest listener due to an ... | John Mayhew | 2012-04-20 |
* | | | | Merge pull request #170 from mayhewinator/WorkingBranch | mayhewinator | 2012-04-19 |
|\| | | | |||
| * | | | Removed hack that required us to use a bogus url for host permissions. Chrome... | John Mayhew | 2012-04-19 |
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-04-19 |
|\ \ \ \ | |||
| * | | | | Merge pull request #169 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-04-19 |
| |\| | | | |||
| | * | | | Updated Manifest.json for the CRX build | John Mayhew | 2012-04-19 |
| |/ / / | |||
* | | | | Merge branch 'refs/heads/master' into cleanup | Valerio Virgillito | 2012-04-19 |
|\| | | | |||
* | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 |
| | * | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 |
| | * | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 |
| | * | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 |
| | * | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 |
| | * | | Merge branch 'refs/heads/Document' into stage-document-architecture | Valerio Virgillito | 2012-04-19 |
| | |\ \ | |||
| | | * \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-16 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-11 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-10 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-04 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-04 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Backup for merge | Jose Antonio Marquez | 2012-04-04 |
| | | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-02 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Setting up document rework | Jose Antonio Marquez | 2012-04-02 |
| | | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-03-28 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-03-27 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-03-26 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-03-21 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-03-16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-03-14 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | | | | typo fix | Valerio Virgillito | 2012-04-19 |
| | * | | | | | | | | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | | | | | | | | | | | | | | | | * | re-compute and store the center of the subpath in local coordinates upon file... | Pushkar Joshi | 2012-04-24 |
| | | | | | | | | | | | | | | | | * | allow the addition of the pen tool to the timeline | Pushkar Joshi | 2012-04-23 |
| | | | | | | | | | | | | | | | | * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-19 |
| | | | | | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | Merge pull request #168 from mqg734/EricMerge | Valerio Virgillito | 2012-04-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool... | Nivesh Rajbhandari | 2012-04-18 |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Snapping_II' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | | | | | | Allow snapping to unselected objects | hwc487 | 2012-04-17 |
| | | * | | | | | | | | | | | | | | | | | snapping for stage rotation tool | hwc487 | 2012-04-16 |
| | | * | | | | | | | | | | | | | | | | | 3D translation fixes | hwc487 | 2012-04-16 |
| | | * | | | | | | | | | | | | | | | | | 3D rotation | hwc487 | 2012-04-13 |