aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | patse raw image data to stageAnanya Sen2012-06-12
| * | | | | | | | | | | | | | | | | | | | - removed extra selection change event,Ananya Sen2012-06-11
| * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | - fixed multiple paste displacementAnanya Sen2012-06-08
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | - cleanse html for copying from outer applicationAnanya Sen2012-06-07
| * | | | | | | | | | | | | | | | | | | | | | cut/paste for canvas objects and for multiple selected objects of mixed typesAnanya Sen2012-06-04
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | cut/paste html elements in single documentAnanya Sen2012-06-01
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | select all pasted elementsAnanya Sen2012-05-29
| * | | | | | | | | | | | | | | | | | | | | | | copy/paste of multiple div and canvas elements doneAnanya Sen2012-05-28
| * | | | | | | | | | | | | | | | | | | | | | | multiple objects copy/paste - in progressAnanya Sen2012-05-25
| * | | | | | | | | | | | | | | | | | | | | | | - multiple element copy/paste - in progressAnanya Sen2012-05-24
| * | | | | | | | | | | | | | | | | | | | | | | cleanupAnanya Sen2012-05-17
| * | | | | | | | | | | | | | | | | | | | | | | copy/paste single webGL shapeAnanya Sen2012-05-16
| * | | | | | | | | | | | | | | | | | | | | | | single selection copy/paste canvas 2d shapes [rectangle and circle]Ananya Sen2012-05-16
| * | | | | | | | | | | | | | | | | | | | | | | Prototype of copy and pasting basic html elements.Ananya Sen2012-05-11
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | removed unnecessary functionAnanya Sen2012-05-08
| * | | | | | | | | | | | | | | | | | | | | | | | copy/paste POCAnanya Sen2012-05-07
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #321 from imix23ways/Timeline-merge-candidateValerio Virgillito2012-06-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidateJonathan Duran2012-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Sub Property ADding KEyframe fixedKruti Shah2012-06-21
* | | | | | | | | | | | | | | | | | | | | | | | | | Fixing reference issue for toolbar fill containerJose Antonio Marquez2012-06-21
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | remove bad fileJonathan Duran2012-06-20
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | <