| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-23 |
| |\ | |||
| | * | Fixing the 3d stack for the youtube channel component. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Fixing the flow component to layout all the tiles on first draw. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge pull request #172 from mayhewinator/WorkingBranch | mayhewinator | 2012-04-20 |
| | |\ | | | | | | | Revert host permission change from 4/19 | ||
| | | * | fixed injection caused by inability to add our webRequest listener due to an ↵ | John Mayhew | 2012-04-20 |
| | | | | | | | | | | | | | incorrect host permission. Reverting to the old hack fix. | ||
| * | | | Fix Select All bug and remove debuggers | Jonathan Duran | 2012-04-23 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | closing. | ||
| | * | | | Timeline: Bug fix: check for uninitialized currentDocument in intialization | Jon Reid | 2012-04-19 |
| | | | | | | | | | | | | | | | | | routine. | ||
| | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-19 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine. | ||
| | * | | | | 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 |
| | |\ \ \ | | | |/ | | |/| | Set the proper host permissions for Ninja in our manifest.json | ||
| | | * | | Removed hack that required us to use a bogus url for host permissions. ↵ | John Mayhew | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Chrome 18 now sends the "Origin" request header if we request host permissions for http://localhost:/ Setting the new and proper host permissions. | ||
| | * | | | 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 | ||
| | | | * | | 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 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵ | Jonathan Duran | 2012-04-19 |
| |\ \ \ \ | | | | | | | | | | | | | | | | TimelineUber | ||
| | * | | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 |
| |\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | |||
| | * | | | Merge pull request #168 from mqg734/EricMerge | Valerio Virgillito | 2012-04-19 |
| | |\ \ \ | | | | | | | | | | | Merging Eric's snapping and tool fixes into master. | ||
| | | * | | | Moving initialzeSnapping routine from RotateObject3DTool tool to ↵ | Nivesh Rajbhandari | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rotate3DToolBase so Rotate Stage uses the same code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * \ \ \ | 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 ↵ | hwc487 | 2012-04-13 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/helper-classes/3D/view-utils.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js js/tools/Translate3DToolBase.js | ||
| | | | * | | | | | 3D Rotate changes | hwc487 | 2012-04-13 |
| | | | | | | | | | |||
| | | | * | | | | | Rotate3D tool changes | hwc487 | 2012-04-11 |
| | | | | | | | | | |||
| | | | * | | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into ↵ | hwc487 | 2012-04-05 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II | ||
| | | | | * | | | | | translate3DObject tool fixes. | hwc487 | 2012-04-05 |
| | | | | | | | | | | |||
| | | | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-04 |
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js | ||
| | | | | * | | | | | | Cap fix for vecUtils. | hwc487 | 2012-04-04 |
| | | | | | | | | | | | |||
| | | | | * | | | | | | turned off translation handles during a multi-object drag. | hwc487 | 2012-04-04 |
| | | | | | | | | | | | |||
| | | | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-03 |
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping | ||
| | | | | * | | | | | | | Translate 3D fix for multi-selection Z translation | hwc487 | 2012-04-02 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | Remove more unneeded requires | Jonathan Duran | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | | Remove unneeded require | Jonathan Duran | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 |
| |\| | | | | | | | | | | |||
| | * | | | | | | | | | | Merge pull request #167 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-18 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | Grid should redraw on elementChanging as well as elementChange. | ||
| | | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-17 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Grid should redraw on elementChanging as well as elementChange. | Nivesh Rajbhandari | 2012-04-17 |
| | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 |
| | | |_|_|_| | |||