Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | - fixed multiple paste displacement | Ananya Sen | 2012-06-08 | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-07 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | - cleanse html for copying from outer application | Ananya Sen | 2012-06-07 | |
| * | | | | | | | | | | | | | | cut/paste for canvas objects and for multiple selected objects of mixed types | Ananya Sen | 2012-06-04 | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | cut/paste html elements in single document | Ananya Sen | 2012-06-01 | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-05-31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | select all pasted elements | Ananya Sen | 2012-05-29 | |
| * | | | | | | | | | | | | | | | | copy/paste of multiple div and canvas elements done | Ananya Sen | 2012-05-28 | |
| * | | | | | | | | | | | | | | | | multiple objects copy/paste - in progress | Ananya Sen | 2012-05-25 | |
| * | | | | | | | | | | | | | | | | - multiple element copy/paste - in progress | Ananya Sen | 2012-05-24 | |
| * | | | | | | | | | | | | | | | | cleanup | Ananya Sen | 2012-05-17 | |
| * | | | | | | | | | | | | | | | | copy/paste single webGL shape | Ananya Sen | 2012-05-16 | |
| * | | | | | | | | | | | | | | | | single selection copy/paste canvas 2d shapes [rectangle and circle] | Ananya Sen | 2012-05-16 | |
| * | | | | | | | | | | | | | | | | Prototype of copy and pasting basic html elements. | Ananya Sen | 2012-05-11 | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-05-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | removed unnecessary function | Ananya Sen | 2012-05-08 | |
| * | | | | | | | | | | | | | | | | | copy/paste POC | Ananya Sen | 2012-05-07 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #321 from imix23ways/Timeline-merge-candidate | Valerio Virgillito | 2012-06-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidate | Jonathan Duran | 2012-06-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Sub Property ADding KEyframe fixed | Kruti Shah | 2012-06-21 | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #318 from joseeight/Color | Valerio Virgillito | 2012-06-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Fixing reference issue for toolbar fill container | Jose Antonio Marquez | 2012-06-21 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #316 from imix23ways/Timeline-merge-candidate | Valerio Virgillito | 2012-06-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | remove bad file | Jonathan Duran | 2012-06-20 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | Timeline: Bug fix: Keyframe animation now works with 3D elements. | Jon Reid | 2012-06-20 | |
| | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into timeline-local | Jon Reid | 2012-06-20 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-20 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | remove old method | Jonathan Duran | 2012-06-20 | |
| | * | | | | | | | | | | | | | | | | | | remove unneeded files | Jonathan Duran | 2012-06-20 | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Removed some code | Kruti Shah | 2012-06-20 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 | |
| |\| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | remove obsolete functions | Jonathan Duran | 2012-06-19 | |
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / |