aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | Merge pull request #80 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/integration-candidate' into FileIO-Build-CandidateJose Antonio Marquez2012-02-28
| | |\| | | | | | | | | | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | CSS attributesJose Antonio Marquez2012-02-28
| | * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-28
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-in...Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | new anchor control guide rendering (smaller handles)Pushkar Joshi2012-02-28
| | | * | | | | | | | Bug fixes:Pushkar Joshi2012-02-28
| | | | |_|/ / / / / | | | |/| | | | | |
| * | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into int...Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | 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
| * | | | | | | | Merge pull request #78 from imix23ways/TimelineValerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-i...Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Updating legal copyJose Antonio Marquez2012-02-27
| | * | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| | | * | | | | | | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| | * | | | | | | | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| * | | | | | | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal i...Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-28
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Enable shift key constraint for Pan Tool.hwc4872012-02-27
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-27
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | * | | | | | | | | | 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 int...Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools.Nivesh Rajbhandari2012-02-27
| | * | | | | | | | | Reset translation values as well when double-clicking to reset the rotation v...Nivesh Rajbhandari2012-02-27
* | | | | | | | | | | Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set doc dirty flag when adding tweens or modifying animationsJonathan Duran2012-03-01
| * | | | | | | | | | | Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| * | | | | | | | | | | Timeline: Track Duration FixJonathan Duran2012-03-01
* | | | | | | | | | | | Timeline: efficiency improvements to collapser. Document switching.Jon Reid2012-03-01
* | | | | | | | | | | | Timeline: Merge. Set collapser heights.Jon Reid2012-03-01
* | | | | | | | | | | | Merge branch 'Timeline-main' into Timeline-newdocJon Reid2012-03-01
|\| | | | | | | | | | |
| * | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-29
| * | | | | | | | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Timeline:Revert back to earlier codeKruti Shah2012-02-29
| | * | | | | | | | | | TImeline: CleanupKruti Shah2012-02-29
| | * | | | | | | | | | Timeline: Changed the variables names to resolve issues.And removed the alert.Kruti Shah2012-02-29
| * | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-29
| |/ / / / / / / / / /
* | | | | | | | | | | Timeline: Document switching and code restructuring.Jon Reid2012-03-01
* | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdocJon Reid2012-02-29
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Timeline: Fix Selection , Partially Fix adding element to an already animated...Kruti Shah2012-02-28
| * | | | | | | | | | | fix for creatingNewFile flagJonathan Duran2012-02-29
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* / | | | | | | | | | Timeline: document switching + new document.Jon Reid2012-02-29
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /