Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | | | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-20 | |
| | | | | | | | | | | | | | | | | | | | | | | | |\ | ||||
| | | | | | | | | | | | | | | | | | | | | | | | | * | Timeline: More bug fixes for selection with multiple documents opening and | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * | Timeline: Bug fix: check for uninitialized currentDocument in intialization | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ | ||||
| | | | | | | | | | | | | | | | | | | | | | | | | * | | Timeline: Bug fix: Maintain selection between document switching. | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | * | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into Timeli... | Jonathan Duran | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||
| | | | | | | | | | | | | | | | | | | | | | | | * | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 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 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-04-13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | 3D Rotate changes | hwc487 | 2012-04-13 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Rotate3D tool changes | hwc487 | 2012-04-11 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin... | hwc487 | 2012-04-05 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_< |