aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| * Merge branch 'refs/heads/Timeline-jd' into Timeline-b2-latestKruti Shah2012-02-29
| |\
* | \ Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-29
|\ \ \
| * | | putting the color panel on top when opening ninjaValerio Virgillito2012-02-28
| * | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-28
| |\ \ \
| | * | | revert changes to the timelineValerio Virgillito2012-02-28
| | * | | adding some margin to the bread crumb buttonsValerio Virgillito2012-02-28
| | * | | cleanup and fixing selecting each bread crumbValerio Virgillito2012-02-28
| | * | | breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
| * | | | 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 '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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | 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-24 00:34:15 +0000