Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-21 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||
| * | | | | | | | | | | remove old method | Jonathan Duran | 2012-06-20 | |
| * | | | | | | | | | | remove unneeded files | Jonathan Duran | 2012-06-20 | |
| * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-18 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Timeline: Replace currentSelectedContainer with new model.domContainer. | Jon Reid | 2012-06-15 | |
| * | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-06-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-06 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-05 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | Sub Props | Kruti Shah | 2012-06-12 | |
| * | | | | | | | | | | | | | | | Color chip in TP | Kruti Shah | 2012-06-08 | |
| * | | | | | | | | | | | | | | | Color Chip | Kruti Shah | 2012-05-31 | |
| |/ / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | Timeline: Bug fixes for deleting elements. | Jon Reid | 2012-05-18 | |
| | * | | | | | | | | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties and | Jon Reid | 2012-05-18 | |
| | * | | | | | | | | | | | | | | Timeline: Multiselect improvements. New convenience methods. Multiselect | Jon Reid | 2012-05-17 | |
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | - added io api to generate file from binary | Ananya Sen | 2012-06-21 | |
* | | | | | | | | | | | | | | | Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ... | Ananya Sen | 2012-06-20 | |
* | | | | | | | | | | | | | | | adding some error handling | Ananya Sen | 2012-06-19 | |
* | | | | | | | | | | | | | | | parse html in memory, instead of using a doom element | Ananya Sen | 2012-06-19 | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-05 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-31 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Fixing merge issues | hwc487 | 2012-05-14 | |
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textures | hwc487 | 2012-05-03 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin... | Nivesh Rajbhandari | 2012-05-03 | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Material editor | hwc487 | 2012-05-02 | |
| * | | | | | | | | | | | | | | | | | | More cleaning up | Jose Antonio Marquez | 2012-06-16 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't ... | Nivesh Rajbhandari | 2012-06-14 | |
| | | | |