Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-03-01 |
|\ | |||
| * | Merge branch 'refs/heads/integration-candidate' | Valerio Virgillito | 2012-02-29 |
| |\ | |||
| | * | Merge pull request #88 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-29 |
| | |\ | |||
| | | * | Fix for performance issue when moving shapes. We don't need to call render e... | Nivesh Rajbhandari | 2012-02-29 |
| | * | | Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal i... | Valerio Virgillito | 2012-02-29 |
| | |\ \ | |||
| | * \ \ | Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-in... | Valerio Virgillito | 2012-02-29 |
| | |\ \ \ | |||
| | | * \ \ | Merge pull request #87 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-02-29 |
| | | |\ \ \ | |||
| | | | * \ \ | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-29 |
| | | | |\ \ \ | |||
| | | | | * | | | Preview Fix | Jose Antonio Marquez | 2012-02-29 |
| | | | * | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-29 |
| | | | |\| | | | |||
| | | | | * | | | Fix: Caching issue with chrome tab API | Jose Antonio Marquez | 2012-02-29 |
| | | | | * | | | Making class level url template variable | Jose Antonio Marquez | 2012-02-29 |
| | | * | | | | | Merge pull request #86 from imix23ways/Timeline | Valerio Virgillito | 2012-02-29 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge pull request #85 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-02-29 |
| | | |\ \ \ \ \ \ | |||
| | | | * | | | | | | prevent extremely long path rendering (temporary fix) | Pushkar Joshi | 2012-02-29 |
| | | | * | | | | | | changed the registration point of the brush tool icon and | Pushkar Joshi | 2012-02-29 |
| | | | * | | | | | | change in comment only | Pushkar Joshi | 2012-02-29 |
| | | | * | | | | | | resample the brush stroke so we don't have gaps if the path is drawn rapidly, | Pushkar Joshi | 2012-02-29 |
| | | | * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-28 |
| | | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-28 |
| | | | |\ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-24 |
| | | | |\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | render the brush stroke as a sequence of rectangles, with each rectangle havi... | Pushkar Joshi | 2012-02-10 |
| | | | * | | | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-02-09 |
| | | | |\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-09 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | | | | first phase of simple resampling to prevent tiny segments | Pushkar Joshi | 2012-02-09 |
| | * | | | | | | | | | | | | | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into i... | Valerio Virgillito | 2012-02-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | We need to remove color buttons from the color model when updating the PI for... | Nivesh Rajbhandari | 2012-02-28 |
| * | | | | | | | | | | | | | | Merge pull request #84 from mqg734/SnapManagerFixes | Valerio Virgillito | 2012-02-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | | SnapManager fixes for sag tags. | Nivesh Rajbhandari | 2012-02-29 |
| |/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-29 |
* | | | | | | | | | | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti... | Jonathan Duran | 2012-02-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Timeline:Revert back to earlier code | Kruti Shah | 2012-02-29 |
| * | | | | | | | | | | | | TImeline: Cleanup | Kruti Shah | 2012-02-29 |
| * | | | | | | | | | | | | Timeline: Changed the variables names to resolve issues.And removed the alert. | Kruti Shah | 2012-02-29 |
| * | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-jd' into Timeline-b2-latest | Kruti Shah | 2012-02-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | putting the color panel on top when opening ninja | Valerio Virgillito | 2012-02-28 |
| * | | | | | | | | | | | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i... | Valerio Virgillito | 2012-02-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | revert changes to the timeline | Valerio Virgillito | 2012-02-28 |
| | * | | | | | | | | | | | | | adding some margin to the bread crumb buttons | Valerio Virgillito | 2012-02-28 |
| | * | | | | | | | | | | | | | cleanup and fixing selecting each bread crumb | Valerio Virgillito | 2012-02-28 |
| | * | | | | | | | | | | | | | breadcrumb cleanup and moving the resized on top of the timeline panel | Valerio Virgillito | 2012-02-27 |
| * | | | | | | | | | | | | | | Merge pull request #81 from ananyasen/integration-candidate | Valerio Virgillito | 2012-02-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | | minor fix for handling selections on switch document | Ananya Sen | 2012-02-28 |
| | * | | | | | | | | | | | | | | selection controller sets _isDocument = true if number of selections are 0, o... | Ananya Sen | 2012-02-28 |
| | * | | | | | | | | | | | | | | persist selections while switching documents | Ananya Sen | 2012-02-28 |
| * | | | | | | | | | | | | | | | Merge pull request #80 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-02-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/integration-candidate' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-28 |
| | |\| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | | CSS attributes | Jose Antonio Marquez | 2012-02-28 |