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
| * | | | | | | | | | | | | | | FIx - can't delete keyframesJonathan Duran2012-06-22
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Removed some codeKruti Shah2012-06-20
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | LockedElements - LayersKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | Layer LockKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | Lock ElementsKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | Lock ELementsKruti Shah2012-06-19
| | * | | | | | | | | | | | | | | | Locked Elements. Layer ControlsKruti Shah2012-06-19
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge pull request #317 from joseeight/ColorValerio Virgillito2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #315 from mqg734/IKNinja_1671Valerio Virgillito2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Fix for error when using ZoomTool.Nivesh Rajbhandari2012-06-20
| | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into IKNinja_1671Nivesh Rajbhandari2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated i...Nivesh Rajbhandari2012-06-19
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge pull request #314 from ericmueller/GridValerio Virgillito2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gridhwc4872012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Added logic to handle grid drawing where grid line starts on an object boundaryhwc4872012-06-19
| | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \