aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'integration-candidate' of ↵Valerio Virgillito2012-02-28
|\ | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate
| * Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| |\ | | | | | | Pentool
| | * reverting manifest namePushkar Joshi2012-02-28
| | |
| | * Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| | |\ | | | | | | | | | | | | | | | | Conflicts: manifest.json
| | * | new anchor control guide rendering (smaller handles)Pushkar Joshi2012-02-28
| | | | | | | | | | | | | | | | | | | | and clamp min. width and height to 1 while resizing subpaths
| | * | Bug fixes:Pushkar Joshi2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | 1152: allow deleting of multiple paths from inside pen tool 1128: keyboard hotkey shortcut 'P' for pen tool 941: changing width or height of the path scales the path
| | * | Merge branch 'master' into pentoolPushkar Joshi2012-02-24
| | |\ \
| | * | | adding unpacked to the manifest file (to differentiate from the ninjateam ↵Pushkar Joshi2012-02-24
| | | | | | | | | | | | | | | | | | | | (main) chrome app)
* | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | integration-candidate
| * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-28
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix for "jumping" issue when using the selection tool repeatedly.Nivesh Rajbhandari2012-02-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge pull request #78 from imix23ways/TimelineValerio Virgillito2012-02-28
|\ \ \ \ \ | | | | | | | | | | | | Timeline bug fixes
| * \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Timeline : Deleting Layer deletes the element, Deleting Layer selects ↵Jonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another layer Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Fix element selection on open docJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Timeline: Basic document switching.Jon Reid2012-02-28
| | | | | |
| * | | | | Fix to animation names to support multiclassed elementsJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | remove commentJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | todo noteJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Fix re-reopened animation duration and millisecondsJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Timeline: Successfully unbind event listeners in tweens when clearing timeline.Jon Reid2012-02-27
| | | | | |
| * | | | | Timeline: try to clean up bogus events manually.Jon Reid2012-02-27
| | | | | |
| * | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
| |\ \ \ \ \
| * | | | | | Timeline: More work on clear timeline method.Jon Reid2012-02-27
| | | | | | |
| * | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
| |\ \ \ \ \ \
| * | | | | | | Timeline: further work on clearTimeline method.Jon Reid2012-02-27
| | | | | | | |
* | | | | | | | Merge branch 'FileIO-Build-Candidate' of ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-27
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Updating legal copyJose Antonio Marquez2012-02-27
| | | | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-27
| |\| | | | | | | |
| | * | | | | | | | Updating creditsJose Antonio Marquez2012-02-27
| | | | | | | | | |
| | * | | | | | | | Merge pull request #21 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-27
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FileIO branch pull request
| | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-27
| |\| | | | | | | | |
| | * | | | | | | | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| | | | | | | | | | |
| | * | | | | | | | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | integration
| * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration
| * | | | | | | | | | | | Enable shift key constraint for Pan Tool.hwc4872012-02-27
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration
| * | | | | | | | | | | | | Color fix for line shapes.hwc4872012-02-27
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Changed the hardcoded publish setting for a PI fix.hwc4872012-02-27
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed various rendering bugs.hwc4872012-02-27
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | bug fixes for canvas 2d shape drawing.hwc4872012-02-23
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | |