aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #81 from ananyasen/integration-candidateValerio Virgillito2012-02-28
|\
| * minor fix for handling selections on switch documentAnanya Sen2012-02-28
| * selection controller sets _isDocument = true if number of selections are 0, o...Ananya Sen2012-02-28
| * persist selections while switching documentsAnanya Sen2012-02-28
* | 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
| |\|
| * | Merge branch 'refs/heads/FileIO' 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 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-27
| | |\ \ \
| * | \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIO-Build-CandidateJose 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
| |\ \ \ \ \
| | * | | | | reverting manifest namePushkar Joshi2012-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 'master' into pentoolPushkar Joshi2012-02-24
| | |\ \ \ \ \
| | * | | | | | adding unpacked to the manifest file (to differentiate from the ninjateam (ma...Pushkar Joshi2012-02-24
* | | | | | | | 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 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Timeline : Deleting Layer deletes the element, Deleting Layer selects another...Jonathan Duran2012-02-28
| * | | | | | | | Fix element selection on open docJonathan Duran2012-02-28
| * | | | | | | | Timeline: Basic document switching.Jon Reid2012-02-28
| * | | | | | | | Fix to animation names to support multiclassed elementsJonathan Duran2012-02-28
| * | | | | | | | remove commentJonathan Duran2012-02-28
| * | | | | | | | todo noteJonathan Duran2012-02-28
| * | | | | | | | Fix re-reopened animation duration and millisecondsJonathan Duran2012-02-28
| * | | | | | | | 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 https://github.com/joseeight/ninja-i...Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| * | | | | | | | | | | 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 i...Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:09:46 +0000