aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | | | |\| | |
| | | | | | * | | Fix: Caching issue with chrome tab APIJose Antonio Marquez2012-02-29
| | | | | | * | | Making class level url template variableJose Antonio Marquez2012-02-29
| | | | * | | | | Merge pull request #86 from imix23ways/TimelineValerio Virgillito2012-02-29
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge pull request #85 from pushkarjoshi/brushtoolValerio Virgillito2012-02-29
| | | | |\ \ \ \ \ \
| | | | | * | | | | | prevent extremely long path rendering (temporary fix)Pushkar Joshi2012-02-29
| | | | | * | | | | | changed the registration point of the brush tool icon andPushkar Joshi2012-02-29
| | | | | * | | | | | change in comment onlyPushkar Joshi2012-02-29
| | | | | * | | | | | resample the brush stroke so we don't have gaps if the path is drawn rapidly,Pushkar Joshi2012-02-29
| | | | | * | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-24
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | render the brush stroke as a sequence of rectangles, with each rectangle havi...Pushkar Joshi2012-02-10
| | | | | * | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-02-09
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-09
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
| | | * | | | | | | | | | | | | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into i...Valerio Virgillito2012-02-29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | We need to remove color buttons from the color model when updating the PI for...Nivesh Rajbhandari2012-02-28
| | * | | | | | | | | | | | | | Merge pull request #84 from mqg734/SnapManagerFixesValerio Virgillito2012-02-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | SnapManager fixes for sag tags.Nivesh Rajbhandari2012-02-29
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | 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
| | | | |\ \